Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update InputMethodSubtypeSwitchingController correctly"

Browse Source
This commit is contained in:
Yohei Yukawa
2014-05-21 14:03:33 +00:00
committed by Android (Google) Code Review
parent 5639828a62 c834a2590c
commit eac222a002
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -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);
}
// ----------------------------------------------------------------------