diff options
| author | Yohei Yukawa <yukawa@google.com> | 2014-05-21 14:03:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 14:03:34 +0000 |
| commit | eac222a002797646b7a8a2d14828c44b27535000 (patch) | |
| tree | 895231164a5d50e2dadf8d59516e7178b1ea8601 | |
| parent | 5639828a62d2b382e6ea46eae0fe9d2fc1fd73ba (diff) | |
| parent | c834a2590cc7ac478ba2ef5a6d8eb7ce471df132 (diff) | |
| download | frameworks_base-eac222a002797646b7a8a2d14828c44b27535000.zip frameworks_base-eac222a002797646b7a8a2d14828c44b27535000.tar.gz frameworks_base-eac222a002797646b7a8a2d14828c44b27535000.tar.bz2 | |
Merge "Update InputMethodSubtypeSwitchingController correctly"
| -rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 5cb2a8a..2d270e7 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -773,8 +773,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (DEBUG) { Slog.i(TAG, "Locale has been changed to " + newLocale); } - // CircularList should be reset when the locale is changed. - mSwitchingController.resetCircularListLocked(mContext); buildInputMethodListLocked(mMethodList, mMethodMap, resetDefaultEnabledIme); if (!updateOnlyWhenLocaleChanged) { final String selectedImiId = mSettings.getSelectedInputMethod(); @@ -2642,6 +2640,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub setInputMethodEnabledLocked(defaultImiId, true); } } + + mSwitchingController.resetCircularListLocked(mContext); } // ---------------------------------------------------------------------- |