summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tadashi G. Takaoka <takaoka@google.com> 2012-01-17 14:53:45 +0900
committer Tadashi G. Takaoka <takaoka@google.com> 2012-01-17 15:05:48 +0900
commitb91b2682c399d5a074a5e73c89a18f4faf25ce0c (patch)
tree293d68e84cbf369807eaeaeb52458c9e5a2885e3
parentade420df08a40bd568df48a3b023b63aafc8e3ee (diff)
Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
This change overrides I59bb56f6. Bug: 5850605 Change-Id: Iac92a3f618df2a20c5b45698780815cedbec723a
-rw-r--r--core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml3
-rw-r--r--core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml2
-rw-r--r--core/res/res/layout/keyguard_screen_password_landscape.xml3
-rw-r--r--core/res/res/layout/keyguard_screen_password_portrait.xml3
4 files changed, 4 insertions, 7 deletions
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 568933c0a7f7..43d0a2c5b31f 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
@@ -97,8 +97,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@null"
android:textColor="#ffffffff"
- android:imeOptions="flagNoFullscreen|actionDone"
- android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+ android:imeOptions="flagForceAscii|flagNoFullscreen|actionDone"
/>
<!-- This delete button is only visible for numeric PIN entry -->
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 335a6419d069..8c02888b0e9b 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:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+ android:imeOptions="flagForceAscii"
/>
<!-- This delete button is only visible for numeric PIN entry -->
diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml
index e95553f882ec..66d7fd79044c 100644
--- a/core/res/res/layout/keyguard_screen_password_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_password_landscape.xml
@@ -153,8 +153,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
- android:imeOptions="flagNoFullscreen|actionDone"
- android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+ android:imeOptions="flagForceAscii|flagNoFullscreen|actionDone"
/>
<!-- 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 cfcc7949dfce..426b2f7f139e 100644
--- a/core/res/res/layout/keyguard_screen_password_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_password_portrait.xml
@@ -119,8 +119,7 @@
android:background="@null"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff"
- android:imeOptions="actionDone"
- android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+ android:imeOptions="flagForceAscii|actionDone"
/>
<!-- This delete button is only visible for numeric PIN entry -->