Merge "Fix Java 8 un-compilable code." (50b0e0b1) · Commits · e / os / android_packages_apps_Settings

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

+5 −4

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

		var alwaysOnPreference = new SwitchPreference(getPrefContext());
		SwitchPreference alwaysOnPreference = new SwitchPreference(getPrefContext());
		alwaysOnPreference.setTitle(
		R.string.accessibility_screen_magnification_always_on_title);
		alwaysOnPreference.setSummary(
		@@ -237,7 +237,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
		MagnificationAlwaysOnPreferenceController.PREF_KEY);
		generalCategory.addPreference(alwaysOnPreference);

		var alwaysOnPreferenceController = new MagnificationAlwaysOnPreferenceController(
		MagnificationAlwaysOnPreferenceController alwaysOnPreferenceController =
		new MagnificationAlwaysOnPreferenceController(
		getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
		getSettingsLifecycle().addObserver(alwaysOnPreferenceController);
		alwaysOnPreferenceController.displayPreference(getPreferenceScreen());
		@@ -347,7 +348,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
		AccessibilitySettingsContentObserver contentObserver) {
		super.registerKeysToObserverCallback(contentObserver);

		var keysToObserve = List.of(
		List<String> keysToObserve = List.of(
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
		Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED
		);