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

Commit 92c97579 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix Java 8 un-compilable code.""

parents 4c39f691 caa04b63

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -228,7 +228,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
            return;

            return;

        }

        }





        SwitchPreference alwaysOnPreference = new SwitchPreference(getPrefContext());

        var alwaysOnPreference = new SwitchPreference(getPrefContext());

        alwaysOnPreference.setTitle(

        alwaysOnPreference.setTitle(

                R.string.accessibility_screen_magnification_always_on_title);

                R.string.accessibility_screen_magnification_always_on_title);

        alwaysOnPreference.setSummary(

        alwaysOnPreference.setSummary(
@@ -237,8 +237,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
                MagnificationAlwaysOnPreferenceController.PREF_KEY);

                MagnificationAlwaysOnPreferenceController.PREF_KEY);

        generalCategory.addPreference(alwaysOnPreference);

        generalCategory.addPreference(alwaysOnPreference);





        MagnificationAlwaysOnPreferenceController alwaysOnPreferenceController =

        var alwaysOnPreferenceController = new MagnificationAlwaysOnPreferenceController(

                new MagnificationAlwaysOnPreferenceController(

                getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);

                getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);

        getSettingsLifecycle().addObserver(alwaysOnPreferenceController);

        getSettingsLifecycle().addObserver(alwaysOnPreferenceController);

        alwaysOnPreferenceController.displayPreference(getPreferenceScreen());

        alwaysOnPreferenceController.displayPreference(getPreferenceScreen());
@@ -348,7 +347,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
            AccessibilitySettingsContentObserver contentObserver) {

            AccessibilitySettingsContentObserver contentObserver) {

        super.registerKeysToObserverCallback(contentObserver);

        super.registerKeysToObserverCallback(contentObserver);





        List<String> keysToObserve = List.of(

        var keysToObserve = List.of(

            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,

            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,

            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED

            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED

        );

        );