Skip to content

Commit f4c77df

Browse files
Gilles DebunneAndroid (Google) Code Review
authored andcommitted
Merge "Fixed PIN display, including in Arabic." into jb-dev
2 parents e79e875 + 9c30855 commit f4c77df

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@
5757
android:background="@android:drawable/edit_text">
5858

5959
<!-- displays dots as user enters pin -->
60-
<TextView android:id="@+id/pinDisplay"
60+
<EditText android:id="@+id/pinDisplay"
6161
android:layout_width="0dip"
6262
android:layout_height="wrap_content"
6363
android:layout_weight="1"
6464
android:maxLines="1"
6565
android:textAppearance="?android:attr/textAppearanceLargeInverse"
66+
android:textColor="@android:color/primary_text_holo_light"
6667
android:textStyle="bold"
6768
android:inputType="textPassword"
6869
/>

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@
5757
android:background="@android:drawable/edit_text">
5858

5959
<!-- displays dots as user enters pin -->
60-
<TextView android:id="@+id/pinDisplay"
60+
<EditText android:id="@+id/pinDisplay"
6161
android:layout_width="0dip"
6262
android:layout_height="wrap_content"
6363
android:layout_weight="1"
6464
android:maxLines="1"
6565
android:textAppearance="?android:attr/textAppearanceLargeInverse"
66+
android:textColor="@android:color/primary_text_holo_light"
6667
android:textStyle="bold"
6768
android:inputType="textPassword"
6869
/>

core/res/res/layout/keyguard_screen_sim_puk_landscape.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,16 @@
122122
android:background="@android:drawable/edit_text">
123123

124124
<!-- displays dots as user enters new pin -->
125-
<TextView android:id="@+id/pinDisplay"
125+
<EditText android:id="@+id/pinDisplay"
126126
android:layout_width="0dip"
127127
android:layout_height="wrap_content"
128128
android:layout_weight="1"
129129
android:maxLines="1"
130130
android:textAppearance="?android:attr/textAppearanceLargeInverse"
131+
android:textColor="@android:color/primary_text_holo_light"
131132
android:textStyle="bold"
132133
android:inputType="textPassword"
134+
android:hint="@android:string/keyguard_password_enter_pin_prompt"
133135
/>
134136

135137
<ImageButton android:id="@+id/pinDel"

0 commit comments

Comments
 (0)