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

Commit 7ea58d31 authored by satok's avatar satok
Browse files

Update enabled subtypes in the input method subtype enabler in "onResume" 

Bug: 5446825
Change-Id: Iab52ecb8a7334b7be3a81350fbfc9b02d09e88d4
parent 140f6c6c

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

+3 −2
Original line number Diff line number Diff line
@@ -317,9 +317,9 @@ public class InputMethodAndSubtypeUtil { 
                    }

                }

                setSubtypesPreferenceEnabled(context, inputMethodInfos, imiId, isEnabled);

                updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes);

            }

        }

        updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes);

    }



    public static void setSubtypesPreferenceEnabled(SettingsPreferenceFragment context,
@@ -346,7 +346,8 @@ public class InputMethodAndSubtypeUtil { 
        PreferenceScreen preferenceScreen = context.getPreferenceScreen();

        for (InputMethodInfo imi : inputMethodProperties) {

            String id = imi.getId();

            HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id);

            if (!enabledSubtypes.containsKey(id)) break;

            final HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id);

            final int subtypeCount = imi.getSubtypeCount();

            for (int i = 0; i < subtypeCount; ++i) {

                InputMethodSubtype subtype = imi.getSubtypeAt(i);

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

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ public class InputMethodPreference extends CheckBoxPreference 
    public void setChecked(boolean checked) {

        super.setChecked(checked);

        saveImeSettings();

        updateSummary();

    }



    private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) {