aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-06 23:58:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-06 23:58:07 +0000
commitc5aefe7d7b635b4cdbc249135a6e58abcfeac18b (patch)
tree76438ed3cbb49782337e4926663603d1a1b28a98 /java/src/com/android/inputmethod/latin/LatinIME.java
parent1d2fadbe072bae8059e5d426735eb8650e1b37a1 (diff)
parent6e61cd3b3ba8853513b9d0167e76d670ae31a7f1 (diff)
downloadlatinime-c5aefe7d7b635b4cdbc249135a6e58abcfeac18b.tar.gz
latinime-c5aefe7d7b635b4cdbc249135a6e58abcfeac18b.tar.xz
latinime-c5aefe7d7b635b4cdbc249135a6e58abcfeac18b.zip
am 6e61cd3b: Merge "Move some methods out from SubtypeSwitcher"
* commit '6e61cd3b3ba8853513b9d0167e76d670ae31a7f1': Move some methods out from SubtypeSwitcher
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index dc665471d..eb0037e8c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -626,7 +626,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void refreshPersonalizationDictionarySession(
final SettingsValues currentSettingsValues) {
mDictionaryFacilitator.setIsMonolingualUser(
- mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes());
+ mRichImm.isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes());
mPersonalizationDictionaryUpdater.onLoadSettings(
currentSettingsValues.mUsePersonalizedDicts);
mContextualDictionaryUpdater.onLoadSettings(currentSettingsValues.mUsePersonalizedDicts);
@@ -863,7 +863,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// also wouldn't be consuming gesture data.
mGestureConsumer = GestureConsumer.NULL_GESTURE_CONSUMER;
mRichImm.clearSubtypeCaches();
- mSubtypeSwitcher.refreshSubtypeInfo();
+ mSubtypeSwitcher.onSubtypeChanged(mRichImm.getCurrentRawSubtype());
final KeyboardSwitcher switcher = mKeyboardSwitcher;
switcher.updateKeyboardTheme();
final MainKeyboardView mainKeyboardView = switcher.getMainKeyboardView();