From caa04b6303ba09e47dfdc5ea96c5d594de53d47a Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Thu, 9 Feb 2023 06:07:20 +0000
Subject: [PATCH] Revert "Fix Java 8 un-compilable code."

This reverts commit c9fc8bca94b360c0a288195dd348b8ddaf96475d.

Reason for revert: No longer need Java 8 compilable

Change-Id: I4ada6a74c7030899a8c5fb646440acee79149dce
---
 .../ToggleScreenMagnificationPreferenceFragment.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index e59b4c24e9a..0558f25f1a4 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -228,7 +228,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
             return;
         }
 
-        SwitchPreference alwaysOnPreference = new SwitchPreference(getPrefContext());
+        var alwaysOnPreference = new SwitchPreference(getPrefContext());
         alwaysOnPreference.setTitle(
                 R.string.accessibility_screen_magnification_always_on_title);
         alwaysOnPreference.setSummary(
@@ -237,9 +237,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
                 MagnificationAlwaysOnPreferenceController.PREF_KEY);
         generalCategory.addPreference(alwaysOnPreference);
 
-        MagnificationAlwaysOnPreferenceController alwaysOnPreferenceController =
-                new MagnificationAlwaysOnPreferenceController(
-                        getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
+        var alwaysOnPreferenceController = new MagnificationAlwaysOnPreferenceController(
+                getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
         getSettingsLifecycle().addObserver(alwaysOnPreferenceController);
         alwaysOnPreferenceController.displayPreference(getPreferenceScreen());
         addPreferenceController(alwaysOnPreferenceController);
@@ -348,7 +347,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
             AccessibilitySettingsContentObserver contentObserver) {
         super.registerKeysToObserverCallback(contentObserver);
 
-        List<String> keysToObserve = List.of(
+        var keysToObserve = List.of(
             Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
             Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED
         );