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

* commit '45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c':
  Fix SubtypeSwitcher incomplete initialization
This commit is contained in:
Tadashi G. Takaoka 2012-04-25 23:25:14 -07:00 committed by Android Git Automerger
commit e5fb1075d8

View file

@ -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();