diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-25 23:22:06 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-04-25 23:22:06 -0700 |
| commit | 45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c (patch) | |
| tree | a7eecf532cac5d99c84135f856e262470274f2ca /java/src/com/android/inputmethod | |
| parent | 27b42ced86e1c85de3d59d91a9e5c577fa552569 (diff) | |
| parent | 3d407cc086145db6b05af25a0610ef9ba2d263ec (diff) | |
| download | latinime-45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c.tar.gz latinime-45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c.tar.xz latinime-45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c.zip | |
Merge "Fix SubtypeSwitcher incomplete initialization" into jb-dev
Diffstat (limited to 'java/src/com/android/inputmethod')
| -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(); |