New text field to display the punched numbers.

The numbers are centered in the field.
The active background is used when non empty.
Added top and bottom margin.
The font used appear a bit small compare to the
design, need to come up with a textAppearance resource
to control it (future CL)

Tested on cdma and gsm phones.

Bug: 2104523

diff --git a/res/layout-finger/twelve_key_dialer.xml b/res/layout-finger/twelve_key_dialer.xml
index 74f644b..418b154 100644 (file)
--- a/res/layout-finger/twelve_key_dialer.xml
+++ b/res/layout-finger/twelve_key_dialer.xml
@@ -20,10 +20,15 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
 >
+
     <!-- Text field above the keypad where the digits are displayed -->
+    <!-- TODO: Use a textAppearance to control the display of the number -->
     <EditText android:id="@+id/digits"
         android:layout_width="fill_parent"
         android:layout_height="66dip"
+        android:layout_marginBottom="6dip"
+        android:layout_marginTop="1dip"
+        android:gravity="center"
         android:maxLines="1"
         android:scrollHorizontally="true"
         android:textSize="28sp"

diff --git a/res/layout-land-finger/twelve_key_dialer.xml b/res/layout-land-finger/twelve_key_dialer.xml
index 0b89572..11ec8d6 100644 (file)
--- a/res/layout-land-finger/twelve_key_dialer.xml
+++ b/res/layout-land-finger/twelve_key_dialer.xml
@@ -22,9 +22,13 @@
 >
 
     <!-- Text field above the keypad where the digits are displayed -->
+    <!-- TODO: Use a textAppearance to control the display of the number -->
     <EditText android:id="@+id/digits"
         android:layout_width="fill_parent"
         android:layout_height="66dip"
+        android:layout_marginBottom="6dip"
+        android:layout_marginTop="1dip"
+        android:gravity="center"
         android:maxLines="1"
         android:scrollHorizontally="true"
         android:textSize="28sp"

diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index ebb76c0..bdc6b6f 100644 (file)
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -155,6 +155,13 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
             mDigits.getText().clear();
         }
 
+        final boolean notEmpty = mDigits.length() != 0;
+        if (notEmpty) {
+            mDigits.setBackgroundDrawable(mDigitsBackground);
+        } else {
+            mDigits.setBackgroundDrawable(mDigitsEmptyBackground);
+        }
+
         updateDialAndDeleteButtonStateEnabledAttr();
     }
 
@@ -165,10 +172,9 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
         // Set the content view
         setContentView(getContentViewResource());
 
-        // Load up the resources for the text field and delete button
+        // Load up the resources for the text field.
         Resources r = getResources();
         mDigitsBackground = r.getDrawable(R.drawable.btn_dial_textfield_active);
-        //mDigitsBackground.setDither(true);
         mDigitsEmptyBackground = r.getDrawable(R.drawable.btn_dial_textfield);
 
         mDigits = (EditText) findViewById(R.id.digits);