Fix SubtypeSwitcher incomplete initialization

Bug: 6400718
Change-Id: Id5dce156ad397b911bfeaedeeddd4aeb21a10b3a
This commit is contained in:
Tadashi G. Takaoka 2012-04-26 13:41:15 +09:00
parent 49caddbdab
commit 3d407cc086

View file

@ -182,12 +182,13 @@ public class SubtypeSwitcher {
+ newSubtype.getLocale() + "/" + newSubtype.getExtraValue() + ", from: " + newSubtype.getLocale() + "/" + newSubtype.getExtraValue() + ", from: "
+ mCurrentSubtype.getLocale() + "/" + mCurrentSubtype.getExtraValue()); + mCurrentSubtype.getLocale() + "/" + mCurrentSubtype.getExtraValue());
} }
if (newSubtype.equals(mCurrentSubtype)) return;
final Locale newLocale = SubtypeLocale.getSubtypeLocale(newSubtype); final Locale newLocale = SubtypeLocale.getSubtypeLocale(newSubtype);
mNeedsToDisplayLanguage.updateIsSystemLanguageSameAsInputLanguage( mNeedsToDisplayLanguage.updateIsSystemLanguageSameAsInputLanguage(
mCurrentSystemLocale.equals(newLocale)); mCurrentSystemLocale.equals(newLocale));
if (newSubtype.equals(mCurrentSubtype)) return;
mCurrentSubtype = newSubtype; mCurrentSubtype = newSubtype;
updateShortcutIME(); updateShortcutIME();
mService.onRefreshKeyboard(); mService.onRefreshKeyboard();