commit 1533a87eeff874c57622bf9aa5fe7a05d2039c40
author Jim Miller <jaggies@google.com> Tue Apr 03 15:24:51 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 03 15:24:51 2012 -0700
tree f16e88080c827d280436fb51eb3daaca19ba531b
parent fde3f83cd26871d2cc904ef05a4f50f272c610e2
parent 337b07c30fd65d8a97113ca7b8b65ee4279f66e3

Merge "Fix 6247249: make sure label on tablets is "done" instead of "next""

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

diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
index fb62eb6..36d4a2a 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
@@ -98,7 +98,7 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:background="@null"
                     android:textColor="#ffffffff"
-                    android:imeOptions="flagForceAscii"
+                    android:imeOptions="flagForceAscii|actionDone"
                 />
 
                 <!-- This delete button is only visible for numeric PIN entry -->