From 9c30855410a6581328cb3eeef739426c9baab358 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Mon, 7 May 2012 12:08:10 -0700
Subject: [PATCH] Fixed PIN display, including in Arabic.

Bug 5731093

Replace TextView by EditText to make it cleaner.
Had to force the text color, although the TextAppearance should
handle it. Maybe something is wrong with the theme.

Also added a hint for consistency.

Change-Id: Icd7170a0ef3757d0313e0799873f2dd375b02f2f
---
 .../res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml   | 3 ++-
 core/res/res/layout/keyguard_screen_sim_pin_portrait.xml      | 3 ++-
 core/res/res/layout/keyguard_screen_sim_puk_landscape.xml     | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

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 d8bea5693ade1..1be446246971e 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"
             />
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 6e8a6458e5bae..9ca351c159049 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"
             />
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 722dc262349ab..56e6426b779fe 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"