diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-17 16:57:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-17 16:57:56 -0800 |
| commit | fa326d1c460dc49692bb0e6865ddb560b7270fd8 (patch) | |
| tree | 438789180a6408f68201fcf5f8a78ad2a1f5725a /core | |
| parent | 48592a3d212b64dabb4b4b6fdf52c68fc857e721 (diff) | |
| parent | b91b2682c399d5a074a5e73c89a18f4faf25ce0c (diff) | |
| download | frameworks_base-fa326d1c460dc49692bb0e6865ddb560b7270fd8.zip frameworks_base-fa326d1c460dc49692bb0e6865ddb560b7270fd8.tar.gz frameworks_base-fa326d1c460dc49692bb0e6865ddb560b7270fd8.tar.bz2 | |
Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions"
Diffstat (limited to 'core')
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 568933c..43d0a2c 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 335a641..8c02888 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 e95553f..66d7fd7 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 cfcc794..426b2f7 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 --> |