diff options
| author |   Amith Yamasani <yamasani@google.com> | 2010-05-04 12:05:33 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-05-04 12:05:33 -0700 |
| commit | b1068051c775f395e2e3e75877be74fa62f2a8df (patch) | |
| tree | 4090b1bce9e9c09e5ecf4e89eba47e46192b9a6a /java/src/com/android/inputmethod/latin/LatinKeyboard.java | |
| parent | 8701305f4f8db3347eb958f3b3b37d8a20cd45c3 (diff) | |
| parent | f02964264f196447b03a88591a2964b67c318718 (diff) | |
| download | latinime-b1068051c775f395e2e3e75877be74fa62f2a8df.tar.gz latinime-b1068051c775f395e2e3e75877be74fa62f2a8df.tar.xz latinime-b1068051c775f395e2e3e75877be74fa62f2a8df.zip | |
am f0296426: Don\'t auto-select the system language in IME language selection screen.
Merge commit 'f02964264f196447b03a88591a2964b67c318718' into froyo-plus-aosp
* commit 'f02964264f196447b03a88591a2964b67c318718':
Don't auto-select the system language in IME language selection screen.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboard.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboard.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java index 32cd8a45f..6aea5d13a 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -430,6 +430,13 @@ public class LatinKeyboard extends Keyboard { Locale locale = mLanguageSwitcher.getLocaleCount() > 0 ? mLanguageSwitcher.getInputLocale() : null; + // If the language count is 1 and is the same as the system language, don't show it. + if (locale != null + && mLanguageSwitcher.getLocaleCount() == 1 + && mLanguageSwitcher.getSystemLocale().getLanguage() + .equalsIgnoreCase(locale.getLanguage())) { + locale = null; + } if (mLocale != null && mLocale.equals(locale)) return; mLocale = locale; updateSpaceBarForLocale(); |