diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-04 12:52:11 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-04-04 12:59:58 +0900 |
| commit | 32bfc1601a8ae7197efff9884afe330f7f64e2b0 (patch) | |
| tree | cd6560d7779a39585c9634b3cd66d427613a5a7e /java/src | |
| parent | 3bf57a5624679a20db26df912077a53b9f90ad36 (diff) | |
| download | latinime-32bfc1601a8ae7197efff9884afe330f7f64e2b0.tar.gz latinime-32bfc1601a8ae7197efff9884afe330f7f64e2b0.tar.xz latinime-32bfc1601a8ae7197efff9884afe330f7f64e2b0.zip | |
Use language agnostic QWERTY for forceAscii
Bug: 6286208
Change-Id: I1b3b6f04c9033e7dc57a30e8dce43e01428b8e4e
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSet.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSet.java b/java/src/com/android/inputmethod/keyboard/KeyboardSet.java index 263f17f74..57319f8a7 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSet.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSet.java @@ -34,6 +34,7 @@ import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.LocaleUtils.RunInLocale; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.StringUtils; +import com.android.inputmethod.latin.SubtypeLocale; import com.android.inputmethod.latin.XmlParseUtils; import org.xmlpull.v1.XmlPullParser; @@ -247,7 +248,8 @@ public class KeyboardSet { final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii( mParams.mEditorInfo.imeOptions) || deprecatedForceAscii; - mParams.mLocale = (forceAscii && !asciiCapable) ? Locale.US : inputLocale; + mParams.mLocale = (forceAscii && !asciiCapable) + ? SubtypeLocale.LOCALE_NO_LANGUAGE_QWERTY : inputLocale; return this; } diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index c2dafcf73..7541bd31b 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -375,6 +375,9 @@ public class SubtypeSwitcher { } public boolean needsToDisplayLanguage(Locale keyboardLocale) { + if (keyboardLocale.equals(SubtypeLocale.LOCALE_NO_LANGUAGE_QWERTY)) { + return true; + } if (!keyboardLocale.equals(mInputLocale)) { return false; } |