summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-02-02 13:22:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-02 13:22:47 -0800
commitb709a85367bf4d1bacb7cf2ecacf75a2e07ff262 (patch)
tree8ddd6bd46f34e13c9950c762ad92d02b902edc51 /core
parent9ca397f5f06ac4cc970ebba9968794ff75b2c84b (diff)
parentc2c2360bf1c7e005225383ec9fb5c39c0ef88a74 (diff)
downloadframeworks_base-b709a85367bf4d1bacb7cf2ecacf75a2e07ff262.zip
frameworks_base-b709a85367bf4d1bacb7cf2ecacf75a2e07ff262.tar.gz
frameworks_base-b709a85367bf4d1bacb7cf2ecacf75a2e07ff262.tar.bz2
am c2c2360b: am 22d23eb5: Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
* commit 'c2c2360bf1c7e005225383ec9fb5c39c0ef88a74': Fix 3410155: Remove hint text from password entry field.
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
2 files changed, 0 insertions, 2 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 16bfc31..1783088 100644
--- a/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
+++ b/core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
@@ -61,7 +61,6 @@
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 b87b51f..63241dd 100644
--- a/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
+++ b/core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
@@ -57,7 +57,6 @@
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"
/>