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

Commit c834a259 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Update InputMethodSubtypeSwitchingController correctly 

User visible behavior is supposed to be identical with and
without this CL.

Previously, there is some corner cases where
InputMethodSubtypeSwitchingController#resetCircularListLocked is
not called but the list of enabled input method is updated.

Fortunately, this corner cases are not observable for a user
because we have not updated the the rotation order dynamically.

However we should fix this before implementing smarter rotation
algorithm that changes the rotation order dynamically.

BUG: 7043015
Change-Id: I145a514dc4cde369ba50431c408c916046ab0c6e
parent e1a2e26a

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);

    }



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