summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-01-20 17:43:45 -0800
committerJim Miller <jaggies@google.com>2011-01-23 16:11:44 -0800
commita1224a684dfa0d717950ba3055ea2cfdf8a44c1b (patch)
tree2d4e1a7a836562774f4b81e557cc71aa03206320 /core
parent055e56ee1bf62d9dc97ba3b483c79312e2bb2beb (diff)
downloadframeworks_base-a1224a684dfa0d717950ba3055ea2cfdf8a44c1b.zip
frameworks_base-a1224a684dfa0d717950ba3055ea2cfdf8a44c1b.tar.gz
frameworks_base-a1224a684dfa0d717950ba3055ea2cfdf8a44c1b.tar.bz2
Fix 3373106: add hint text to PasswordUnlock
Change-Id: Ie0a5081cf74da551a161f46457b987bcdcef2127
Diffstat (limited to 'core')
-rw-r--r--core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml1
-rw-r--r--core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml1
-rwxr-xr-xcore/res/res/values/strings.xml3
3 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml b/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
index 5ea43dc..c1149e3 100644
--- a/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
+++ b/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
@@ -61,6 +61,7 @@
android:textSize="24sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@drawable/lockscreen_password_field_dark"
+ android:hint="@string/keyguard_password_entry_touch_hint"
android:textColor="#ffffffff"
/>
diff --git a/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml b/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
index 8a059f5..fab69d8 100644
--- a/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
+++ b/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
@@ -57,6 +57,7 @@
android:layout_marginBottom="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@drawable/lockscreen_password_field_dark"
+ android:hint="@string/keyguard_password_entry_touch_hint"
android:textColor="#ffffffff"
/>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 46e45db..fd891c3 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1637,6 +1637,9 @@
Displayed in one line in a large font. -->
<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.
Displayed in one line in a large font. -->
<string name="keyguard_password_enter_password_code">Enter password to unlock</string>