commit f4c77df0593c1bb81dd5ee04ee415a8cf3bd37bb
author Gilles Debunne <debunne@google.com> Mon May 07 17:45:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 07 17:45:47 2012 -0700
tree a1aabc73e3058e7d4f453fc3e7fbb0e0f3ce1232
parent e79e87581280f4f3b26b1d4496b34cbb9aa39ae5
parent 9c30855410a6581328cb3eeef739426c9baab358

Merge "Fixed PIN display, including in Arabic." into jb-dev

core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml

diff --git a/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml
index d8bea56..1be4462 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml
@@ -57,12 +57,13 @@
             android:background="@android:drawable/edit_text">
 
             <!-- displays dots as user enters pin -->
-            <TextView android:id="@+id/pinDisplay"
+            <EditText android:id="@+id/pinDisplay"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:maxLines="1"
                 android:textAppearance="?android:attr/textAppearanceLargeInverse"
+                android:textColor="@android:color/primary_text_holo_light"
                 android:textStyle="bold"
                 android:inputType="textPassword"
             />

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
index 6e8a645..9ca351c 100644
--- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
@@ -57,12 +57,13 @@
             android:background="@android:drawable/edit_text">
 
             <!-- displays dots as user enters pin -->
-            <TextView android:id="@+id/pinDisplay"
+            <EditText android:id="@+id/pinDisplay"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:maxLines="1"
                 android:textAppearance="?android:attr/textAppearanceLargeInverse"
+                android:textColor="@android:color/primary_text_holo_light"
                 android:textStyle="bold"
                 android:inputType="textPassword"
             />

core/res/res/layout/keyguard_screen_sim_puk_landscape.xml

diff --git a/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml b/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml
index 722dc26..56e6426 100644
--- a/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml
@@ -122,14 +122,16 @@
                       android:background="@android:drawable/edit_text">
 
                       <!-- displays dots as user enters new pin -->
-                      <TextView android:id="@+id/pinDisplay"
+                      <EditText android:id="@+id/pinDisplay"
                           android:layout_width="0dip"
                           android:layout_height="wrap_content"
                           android:layout_weight="1"
                           android:maxLines="1"
                           android:textAppearance="?android:attr/textAppearanceLargeInverse"
+                          android:textColor="@android:color/primary_text_holo_light"
                           android:textStyle="bold"
                           android:inputType="textPassword"
+                          android:hint="@android:string/keyguard_password_enter_pin_prompt"
                       />
 
                       <ImageButton android:id="@+id/pinDel"