diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-25 23:25:14 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-04-25 23:25:14 -0700 |
| commit | e5fb1075d86f27f2f0095ffd31eb68985ec4a7b3 (patch) | |
| tree | a7eecf532cac5d99c84135f856e262470274f2ca /java/src | |
| parent | 550932926402bad50f7c0f2e25df4f258f7b7310 (diff) | |
| parent | 45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c (diff) | |
| download | latinime-e5fb1075d86f27f2f0095ffd31eb68985ec4a7b3.tar.gz latinime-e5fb1075d86f27f2f0095ffd31eb68985ec4a7b3.tar.xz latinime-e5fb1075d86f27f2f0095ffd31eb68985ec4a7b3.zip | |
am 45c57dcc: Merge "Fix SubtypeSwitcher incomplete initialization" into jb-dev
* commit '45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c':
Fix SubtypeSwitcher incomplete initialization
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index 804287309..f2d971ca4 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -182,12 +182,13 @@ public class SubtypeSwitcher { + newSubtype.getLocale() + "/" + newSubtype.getExtraValue() + ", from: " + mCurrentSubtype.getLocale() + "/" + mCurrentSubtype.getExtraValue()); } - if (newSubtype.equals(mCurrentSubtype)) return; final Locale newLocale = SubtypeLocale.getSubtypeLocale(newSubtype); mNeedsToDisplayLanguage.updateIsSystemLanguageSameAsInputLanguage( mCurrentSystemLocale.equals(newLocale)); + if (newSubtype.equals(mCurrentSubtype)) return; + mCurrentSubtype = newSubtype; updateShortcutIME(); mService.onRefreshKeyboard(); |