Merge "Fix SubtypeSwitcher incomplete initialization" into jb-dev

2012-04-25 23:22:06 -07:00 · 2012-04-25 23:22:06 -07:00 · 45c57dcc2d
parent 27b42ced86 3d407cc086
commit 45c57dcc2d
1 changed files with 2 additions and 1 deletions
--- 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();