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

Commit 6452b847 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Fix jank when dismissing InputMethodAndSubtypeEnabler. 

InputMethodAndSubtypeUtil#saveInputMethodSubtypeList() has a bug that
it saves implicitly enabled subtypes when "Use system languages" is
checked.  Implicitly enabled subtypes are transient data and the system
should have only a null data (0) in the persistent strage.  The root
cause of this bug is that the method in question has not checked whether
the preference item is in enabled (not grayed-out).   If it is
grayed-out, its checked state does not mean that the user manually
checked that subtype but it is just an indicator for the user.

The strange UI jank when dismissing InputMethodAndSubtypeEnabler is one
of the victim of the above bug because we have worked around it by
actually changing checked state before calling the method in question.

With this CL we no longer need to update preference items in
InputMethodAndSubtypeEnabler#onPause().

Bug: 27867966
Change-Id: Ifc291d77ea41a988438765b9ba16bc5d18a15e1b
parent a2dda412

src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java

+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment 
    @Override

    public void onPause() {

        super.onPause();

        // Clear all subtypes of all IMEs to make sure

        updateImplicitlyEnabledSubtypes(null /* targetImiId */, false /* check */);

        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(this, getContentResolver(),

                mInputMethodInfoList, mHaveHardKeyboard);

    }

src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java

+6 −1
Original line number Diff line number Diff line
@@ -209,7 +209,12 @@ class InputMethodAndSubtypeUtil { 
                        needsToResetSelectedSubtype = true;

                        subtypePrefFound = true;

                    }

                    if (subtypePref.isChecked()) {

                    // Checking <code>subtypePref.isEnabled()</code> is insufficient to determine

                    // whether the user manually enabled this subtype or not.  Implicitly-enabled

                    // subtypes are also checked just as an indicator to users.  We also need to

                    // check <code>subtypePref.isEnabled()</code> so that only manually enabled

                    // subtypes can be saved here.

                    if (subtypePref.isEnabled() && subtypePref.isChecked()) {

                        subtypesSet.add(subtypeHashCodeStr);

                        if (isCurrentInputMethod) {

                            if (selectedInputMethodSubtype == subtype.hashCode()) {