From 76f954582632dff96dc898fd8c2137c290413781 Mon Sep 17 00:00:00 2001
From: Jyotiraditya <imjyotiraditya@pm.me>
Date: Fri, 9 Oct 2020 10:39:59 +0530
Subject: [PATCH] Settings: Move blur toggle to Display options.

Change-Id: I64cadfd69c66a30ada9f5ba5509dd97a85124326
---
 res/xml/development_settings.xml                 |  4 ----
 res/xml/display_settings.xml                     |  4 ++++
 src/com/android/settings/DisplaySettings.java    |  2 ++
 .../DevelopmentSettingsDashboardFragment.java    |  1 -
 .../EnableBlursPreferenceController.java         | 16 ++++------------
 5 files changed, 10 insertions(+), 17 deletions(-)
 rename src/com/android/settings/{development => display}/EnableBlursPreferenceController.java (80%)

diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 3a8c7213c47..024a7d5134e 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -625,10 +625,6 @@
             android:title="@string/hwui_force_dark_title"
             android:summary="@string/hwui_force_dark_summary" />
 
-        <SwitchPreferenceCompat
-            android:key="enable_blurs_on_windows"
-            android:title="@string/window_blurs"/>
-
         <SwitchPreferenceCompat
             android:key="force_msaa"
             android:title="@string/force_msaa"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a8de690e48e..8c0e491d296 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -218,6 +218,10 @@
             android:key="lift_to_wake"
             android:title="@string/lift_to_wake_title"/>
 
+        <SwitchPreferenceCompat
+            android:key="enable_blurs_on_windows"
+            android:title="@string/window_blurs"/>
+
         <SwitchPreferenceCompat
             android:key="tap_to_wake"
             android:title="@string/tap_to_wake"
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index b37ea4f9807..262c13ad946 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -30,6 +30,7 @@ import com.android.settings.display.DisplayScreen;
 import com.android.settings.display.LiftToWakePreferenceController;
 import com.android.settings.display.ShowOperatorNamePreferenceController;
 import com.android.settings.display.TapToWakePreferenceController;
+import com.android.settings.display.EnableBlursPreferenceController;
 import com.android.settings.display.ThemePreferenceController;
 import com.android.settings.display.VrDisplayPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -86,6 +87,7 @@ public class DisplaySettings extends DashboardFragment {
         controllers.add(new CameraGesturePreferenceController(context));
         controllers.add(new LiftToWakePreferenceController(context));
         controllers.add(new TapToWakePreferenceController(context));
+        controllers.add(new EnableBlursPreferenceController(context));
         controllers.add(new VrDisplayPreferenceController(context));
         controllers.add(new ShowOperatorNamePreferenceController(context));
         controllers.add(new ThemePreferenceController(context));
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 4c4bfa24091..196812ddce3 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -795,7 +795,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new DebugNonRectClipOperationsPreferenceController(context));
         controllers.add(new GameDefaultFrameRatePreferenceController(context));
         controllers.add(new ForceDarkPreferenceController(context));
-        controllers.add(new EnableBlursPreferenceController(context));
         controllers.add(new ForceMSAAPreferenceController(context));
         controllers.add(new HardwareOverlaysPreferenceController(context));
         controllers.add(new SimulateColorSpacePreferenceController(context));
diff --git a/src/com/android/settings/development/EnableBlursPreferenceController.java b/src/com/android/settings/display/EnableBlursPreferenceController.java
similarity index 80%
rename from src/com/android/settings/development/EnableBlursPreferenceController.java
rename to src/com/android/settings/display/EnableBlursPreferenceController.java
index d3a521a7798..1360f616df2 100644
--- a/src/com/android/settings/development/EnableBlursPreferenceController.java
+++ b/src/com/android/settings/display/EnableBlursPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.display;
 
 import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
 
@@ -26,12 +26,12 @@ import androidx.preference.Preference;
 import androidx.preference.TwoStatePreference;
 
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Controller that toggles window blurs on devices that support it.
  */
-public final class EnableBlursPreferenceController extends DeveloperOptionsPreferenceController
+public final class EnableBlursPreferenceController extends AbstractPreferenceController
         implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String ENABLE_BLURS_ON_WINDOWS = "enable_blurs_on_windows";
@@ -69,14 +69,6 @@ public final class EnableBlursPreferenceController extends DeveloperOptionsPrefe
     public void updateState(Preference preference) {
         boolean isEnabled = Settings.Global.getInt(mContext.getContentResolver(),
                     Settings.Global.DISABLE_WINDOW_BLURS, 0) == 0;
-        ((TwoStatePreference) mPreference).setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DISABLE_WINDOW_BLURS, 0);
-        updateState(null);
+        ((TwoStatePreference) preference).setChecked(isEnabled);
     }
 }