nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix SubtypeSwitcher incomplete initialization" into jb-dev

Browse source
This commit is contained in:
Tadashi G. Takaoka 2012-04-25 23:22:06 -07:00 committed by Android (Google) Code Review
commit 45c57dcc2d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
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();