Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 93727e84: Merge "Fix 3373106: add hint text to PasswordUnlock" into honeycomb

Browse Source 
* commit '93727e845fa73f3397ccbe4416a5781bb5003883':
  Fix 3373106: add hint text to PasswordUnlock
This commit is contained in:
Jim Miller
2011-01-23 17:08:43 -08:00
committed by Android Git Automerger
parent 9fa533c26e 93727e845f
commit 62a01eca1d
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
View File

@@ -61,6 +61,7 @@
android:textSize="24sp" android:textSize="24sp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@drawable/lockscreen_password_field_dark" android:background="@drawable/lockscreen_password_field_dark"
android:hint="@string/keyguard_password_entry_touch_hint"
android:textColor="#ffffffff" android:textColor="#ffffffff"
/> />

1
core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
View File

@@ -57,6 +57,7 @@
android:layout_marginBottom="5dip" android:layout_marginBottom="5dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@drawable/lockscreen_password_field_dark" android:background="@drawable/lockscreen_password_field_dark"
android:hint="@string/keyguard_password_entry_touch_hint"
android:textColor="#ffffffff" android:textColor="#ffffffff"
/> />

3
core/res/res/values/strings.xml
View File

@@ -1637,6 +1637,9 @@
Displayed in one line in a large font. --> Displayed in one line in a large font. -->
<string name="keyguard_password_enter_pin_code">Enter PIN code</string> <string name="keyguard_password_enter_pin_code">Enter PIN code</string>
<!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
<string name="keyguard_password_entry_touch_hint"><font size="17">Touch to enter password</font></string>
<!-- Instructions telling the user to enter their text password to unlock the keyguard. <!-- Instructions telling the user to enter their text password to unlock the keyguard.
Displayed in one line in a large font. --> Displayed in one line in a large font. -->
<string name="keyguard_password_enter_password_code">Enter password to unlock</string> <string name="keyguard_password_enter_password_code">Enter password to unlock</string>