Revert "Fix Java 8 un-compilable code."

This reverts commit c9fc8bca94.

Reason for revert: No longer need Java 8 compilable

Change-Id: I4ada6a74c7030899a8c5fb646440acee79149dce
This commit is contained in:
Chaohui Wang
2023-02-09 06:07:20 +00:00
committed by Android (Google) Code Review
parent c9fc8bca94
commit caa04b6303

View File

@@ -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,9 +237,8 @@ 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());
addPreferenceController(alwaysOnPreferenceController); addPreferenceController(alwaysOnPreferenceController);
@@ -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
); );