From fb845ece3b79d912c4c6b9845c5f5d34016825b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Fri, 29 May 2020 21:45:42 +0700
Subject: [PATCH] Cherish: Cleanup RGB Gradient Picker

Revert "Cherish:Introduce RGB Gradient Picker [2/2]"

This reverts commit b6057bf285504364157b99825315f72cd13c117a.

Revert "Cherish: Introduce RGB Accenter [2/2]"

This reverts commit 22b278cc53deec9ada28b72e69b35fe7149a2865.

Revert "Revert "Cherish:Add a toggle for the new QS tint [2/2]""

This reverts commit f1acece8c1c2b36107a2d9826f2fdc0c9279b8bb.
---
 res/values-vi/cherish_strings.xml             |  8 ----
 res/values/cherish_strings.xml                |  9 ----
 res/xml/cherish_settings_gaming_mode.xml      | 10 ++--
 res/xml/cherish_settings_quicksettings.xml    |  7 +++
 res/xml/cherish_settings_theme.xml            | 22 ---------
 .../settings/fragments/ThemeSettings.java     | 48 -------------------
 6 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index a53ae31..48ce088 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -239,14 +239,6 @@
     <string name="theme_type_du_pitchblack">Đen tuyền</string>
     <string name="theme_type_dark_grey">Màu xám đen</string>
     <string name="theme_type_material_ocean">Material Ocean</string>
-    <!-- RGB Accenter -->
-    <string name="theme_rgb_title">Màu nhấn RGB| Chủ đề Gradient</string>
-    <string name="themes_hub_title">Chủ đề</string>
-    <string name="themes_hub_summary">Chủ đề màu nhấn Gradients</string>
-    <string name="accent_color">Chọn màu nhấn</string>
-    <string name="accent_summary">Tự làm Gradient</string>
-    <string name="gradient_color">Chọn Gradient</string>
-    <string name="gradient_summary">Làm hiệu ứng Gradient</string>
     <!-- Power menu and dialogs opacity -->
     <string name="lockscreen_secure_power_title">Menu nguồn an toàn</string>
     <string name="lockscreen_secure_power_menu_title">Khóa menu nguồn</string>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 07dc8af..62049ae 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -272,15 +272,6 @@
     <string name="theme_type_dark_grey">Dark Grey</string>
     <string name="theme_type_material_ocean">Material Ocean</string>
 
-	<!-- RGB Accenter -->
-    <string name="theme_rgb_title">RGB Accent | Gradient Theming</string>
-    <string name="themes_hub_title">Themes</string>
-    <string name="themes_hub_summary">Accents-Gradients-Themes</string>
-    <string name="accent_color">Accent picker</string>
-    <string name="accent_summary">Gradient Maker</string>
-    <string name="gradient_color">Gradient picker</string>
-    <string name="gradient_summary">Gradient effect maker</string>
-
 	<!-- Power menu and dialogs opacity -->
     <string name="lockscreen_secure_power_title">Secure power menu</string>
     <string name="lockscreen_secure_power_menu_title">Secure power menu</string>
diff --git a/res/xml/cherish_settings_gaming_mode.xml b/res/xml/cherish_settings_gaming_mode.xml
index 7d6633e..9507e13 100644
--- a/res/xml/cherish_settings_gaming_mode.xml
+++ b/res/xml/cherish_settings_gaming_mode.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<preferencesScreen
+<PreferencesScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/gaming_mode_title">
@@ -59,15 +59,15 @@
         android:summary="@string/gaming_mode_dynamic_summary"
         android:defaultValue="false" />
 
-    <preferencesCategory
+    <PreferenceCategory
         android:title="@string/gaming_mode_app_picker_title"
         android:key="gamingmode_applications">
 
-        <preferences
+        <Preference
             android:key="add_gamingmode_packages"
             android:icon="@drawable/ic_menu_add_white"
             android:title="@string/add_gaming_mode_package_title" />
 
-    </preferencesCategory>
+    </PreferenceCategory>
 
-</preferencesScreen>
+</PreferencesScreen>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 2a92b18..e0ec4fb 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -20,6 +20,13 @@
 	
 	<PreferenceCategory
         android:title="@string/qs_category">
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_panel_bg_use_new_tint"
+            android:icon="@drawable/ic_accent_picker"
+            android:title="@string/qs_bg_use_new_tint"
+            android:summary="@string/qs_bg_use_new_tint_summary"
+            android:defaultValue="true" />
 			
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_blur"
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 6ff8e33..c0525cc 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -42,28 +42,6 @@
         android:entryValues="@array/switch_style_values" />
 
   </PreferenceCategory>
-  
-  <PreferenceCategory
-     android:key="system_rgb_category"
-     android:title="@string/theme_rgb_title">
-
-      <net.margaritov.preference.colorpicker.ColorPickerPreference
-           android:key="accent_color"
-		   android:icon="@drawable/ic_accent_picker"
-           android:title="@string/accent_color"
-           android:summary="@string/accent_summary"
-           android:defaultValue="0xffffff"
-           android:persistent="false" />
-
-     <net.margaritov.preference.colorpicker.ColorPickerPreference
-           android:key="gradient_color"
-           android:icon="@drawable/ic_accent_picker"
-           android:title="@string/gradient_color"
-           android:summary="@string/gradient_summary"
-           android:defaultValue="0xffffff"
-           android:persistent="false" />
-
-   </PreferenceCategory>
 
   <PreferenceCategory
         android:key="rounded_corners_category"
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 89fd890..7d33f0b 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -44,18 +44,12 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 			
 			private static final String PREF_THEME_SWITCH = "theme_switch";
-			 private static final String ACCENT_COLOR = "accent_color";
-    private static final String ACCENT_COLOR_PROP = "persist.sys.theme.accentcolor";
-    private static final String GRADIENT_COLOR = "gradient_color";
-    private static final String GRADIENT_COLOR_PROP = "persist.sys.theme.gradientcolor";
     private static final String SYSUI_ROUNDED_SIZE = "sysui_rounded_size";
     private static final String SYSUI_ROUNDED_CONTENT_PADDING = "sysui_rounded_content_padding";
     private static final String SYSUI_STATUS_BAR_PADDING = "sysui_status_bar_padding";
     private static final String SYSUI_ROUNDED_FWVALS = "sysui_rounded_fwvals";
     private static final String SWITCH_STYLE = "switch_style";
 
-    private ColorPickerPreference mThemeColor;
-    private ColorPickerPreference mGradientColor;
     private UiModeManager mUiModeManager;
 	private IOverlayManager mOverlayService;
     private ListPreference mThemeSwitch;
@@ -128,8 +122,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
                 .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
 		mUiModeManager = getContext().getSystemService(UiModeManager.class);
 		setupThemeSwitchPref();
-		setupAccentPref();
-                 setupGradientPref();
         }
 
     @Override
@@ -204,26 +196,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
                     handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
                     break;
             }
-            try {
-                 mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
-                 mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
-                 mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
-             } catch (RemoteException ignored) {
-             }
-		   }else if (preference == mThemeColor) {
-            int color = (Integer) objValue;
-            String hexColor = String.format("%08X", (0xFFFFFFFF & color));
-            SystemProperties.set(ACCENT_COLOR_PROP, hexColor);
-            try {
-                 mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
-                 mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
-                 mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
-             } catch (RemoteException ignored) {
-             }
-             } else if (preference == mGradientColor) {
-            int color = (Integer) objValue;
-            String hexColor = String.format("%08X", (0xFFFFFFFF & color));
-            SystemProperties.set(GRADIENT_COLOR_PROP, hexColor);
             try {
                  mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
                  mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
@@ -286,26 +258,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
             }
         }
     }
-	
-	private void setupAccentPref() {
-        mThemeColor = (ColorPickerPreference) findPreference(ACCENT_COLOR);
-        String colorVal = SystemProperties.get(ACCENT_COLOR_PROP, "-1");
-        int color = "-1".equals(colorVal)
-                ? Color.WHITE
-                : Color.parseColor("#" + colorVal);
-        mThemeColor.setNewPreviewColor(color);
-        mThemeColor.setOnPreferenceChangeListener(this);
-    }
-
-    private void setupGradientPref() {
-        mGradientColor = (ColorPickerPreference) findPreference(GRADIENT_COLOR);
-        String colorVal = SystemProperties.get(GRADIENT_COLOR_PROP, "-1");
-        int color = "-1".equals(colorVal)
-                ? Color.WHITE
-                : Color.parseColor("#" + colorVal);
-        mGradientColor.setNewPreviewColor(color);
-        mGradientColor.setOnPreferenceChangeListener(this);
-    }
 
     private void restoreCorners() {
         Resources res = null;