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

Commit 7f704f6c authored by Ryan Lin's avatar Ryan Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect UI after triple-tap is disabled" into sc-v2-dev am: 2007a575 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16379103

Change-Id: Icce7853960e621266a8817f22cf88a52fae7a7d5
parents 3b9ad4de 2007a575

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

+8 −3
Original line number Diff line number Diff line
@@ -143,9 +143,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
            setPreferenceScreen(preferenceScreen);

        }



        final List<String> shortcutFeatureKeys = new ArrayList<>();

        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);

        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);

        final List<String> shortcutFeatureKeys = getFeatureSettingsKeys();

        mSettingsContentObserver = new SettingsContentObserver(new Handler(), shortcutFeatureKeys) {

            @Override

            public void onChange(boolean selfChange, Uri uri) {
@@ -155,6 +153,13 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        };

    }



    protected List<String> getFeatureSettingsKeys() {

        final List<String> shortcutFeatureKeys = new ArrayList<>();

        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);

        shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);

        return shortcutFeatureKeys;

    }



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -275,6 +275,13 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
        return context.getText(resId);

    }



    @Override

    protected List<String> getFeatureSettingsKeys() {

        final List<String> shortcutKeys = super.getFeatureSettingsKeys();

        shortcutKeys.add(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);

        return shortcutKeys;

    }



    @Override

    protected CharSequence getShortcutTypeSummary(Context context) {

        if (!mShortcutPreference.isChecked()) {