commit e5fb1075d86f27f2f0095ffd31eb68985ec4a7b3
author Tadashi G. Takaoka <takaoka@google.com> Wed Apr 25 23:25:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 25 23:25:14 2012 -0700
tree a7eecf532cac5d99c84135f856e262470274f2ca
parent 550932926402bad50f7c0f2e25df4f258f7b7310
parent 45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c

am 45c57dcc: Merge "Fix SubtypeSwitcher incomplete initialization" into jb-dev

* commit '45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c':
  Fix SubtypeSwitcher incomplete initialization

java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 8042873..f2d971c 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -182,12 +182,13 @@
                     + 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();