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

Commit 8b1f3b06 authored by Menghan Li's avatar Menghan Li Committed by Automerger Merge Worker
Browse files

Merge "Fix quick settings tooltip changed when color correction fab clicked"... 

Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef917814 am: bf923273

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



Change-Id: I7e00f6edb80abef178d39f8eda3016de35632a00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37fa12e2 bf923273

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

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere 


    @Override

    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {

        final boolean isEnabled = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;

        if (enabled == isEnabled) {

            return;

        }



        if (enabled) {

            showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE);

        }

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

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe 


    @Override

    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {

        final boolean isEnabled = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;

        if (enabled == isEnabled) {

            return;

        }



        if (enabled) {

            showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE);

        }