Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eac222a0 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Update InputMethodSubtypeSwitchingController correctly"

parents 5639828a c834a259

services/core/java/com/android/server/InputMethodManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }



    // ----------------------------------------------------------------------