| commit | 7a962fef2f26b941b916595562d5adfae943d432 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Oct 24 13:31:15 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 24 13:31:15 2011 -0700 |
| tree | 79fc5254678bc94082e73dd1e75436d26b28437f | |
| parent | e869ca9626146265bbb2b5043018dfe532e0661f [diff] | |
| parent | 214406a8e95348bfea8a65d981e508f35bf5cf21 [diff] |
Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml index 99ab8a3..ee1ce5f 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
@@ -62,6 +62,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:background="@drawable/lockscreen_password_field_dark" android:textColor="#ffffffff" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <!-- Numeric keyboard -->
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 64c002f..254dd3e 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
@@ -58,6 +58,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:background="@drawable/lockscreen_password_field_dark" android:textColor="#ffffffff" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <View
diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml index 803047e..62f59f6 100644 --- a/core/res/res/layout/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout/keyguard_screen_password_landscape.xml
@@ -152,6 +152,7 @@ android:background="@null" android:textColor="?android:attr/textColorPrimary" android:imeOptions="flagNoFullscreen|actionDone" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <!-- This delete button is only visible for numeric PIN entry -->
diff --git a/core/res/res/layout/keyguard_screen_password_portrait.xml b/core/res/res/layout/keyguard_screen_password_portrait.xml index 6b03359..597cfe7 100644 --- a/core/res/res/layout/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout/keyguard_screen_password_portrait.xml
@@ -117,6 +117,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#ffffffff" android:imeOptions="actionDone" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <!-- This delete button is only visible for numeric PIN entry -->