From a684d21a65ed3dc8364d9ac4af8aeeec5d9fb3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Mon, 12 Apr 2021 10:02:59 +0700
Subject: [PATCH] Revert "Cherish: Refactor QS Brightness slider options [2/2]"

This reverts commit ea9bb6424adaa1af4d54de0ea5c1f2d30618dff1.
---
 res/values/cherish_arrays.xml              | 12 ++++++++++++
 res/values/cherish_strings.xml             | 13 +++++++------
 res/xml/cherish_settings_quicksettings.xml | 16 ++++++----------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index e9beb45..ebab5ab 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1050,6 +1050,18 @@
         <item>3</item>
         <item>4</item>
     </string-array>
+	
+	<string-array name="qs_show_brightness_slider_entries" translatable="false">
+        <item>@string/qs_show_brightness_slider_show_never</item>
+        <item>@string/qs_show_brightness_slider_show_expanded</item>
+        <item>@string/qs_show_brightness_slider_show_always</item>
+    </string-array>
+
+    <string-array name="qs_show_brightness_slider_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 
     <!-- Panel Background Style-->
     <string-array name="panel_bg_titles" translatable="false">
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index ecbeaa8..334cf1c 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -954,14 +954,15 @@
     <string name="ui_style_round_medium">Round Medium</string>
 
     <!-- Quick Settings brightness slider -->
-    <string name="qs_show_brightness_slider_title">Quick QS brightness slider</string>
-    <string name="qs_show_brightness_slider_summary">Show brightness slider in quickbar</string>
-    <string name="qs_show_brightness_slider_expanded_title">Expanded QS brightness slider</string>
-    <string name="qs_show_brightness_slider_expanded_summary">Show brightness slider when expanded</string>
+    <string name="qs_show_brightness_slider_title">Brightness slider</string>
+    <string name="qs_show_brightness_slider_summary">Show a brightness slider in the quick settings panel</string>
     <string name="qs_show_auto_brightness_title">Autobrightness icon</string>
     <string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
-    <string name="qs_brightness_position_bottom_title">Brightness slider at bottom (only works for Expanded QS)</string>
-    <string name="qs_brightness_position_bottom_summary">Show the brightness slider on bottom of expanded quick settings</string>
+    <string name="qs_show_brightness_slider_show_never">Never show</string>
+    <string name="qs_show_brightness_slider_show_expanded">Show when expanded</string>
+    <string name="qs_show_brightness_slider_show_always">Show always</string>
+    <string name="qs_brightness_position_bottom_title">Brightness slider at bottom</string>
+    <string name="qs_brightness_position_bottom_summary">Show the brightness slider on bottom quick settings</string>
 
     <!-- Panel Background style -->
     <string name="panel_bg_title">Panel background style</string>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index e14c1a2..31e6edc 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -89,24 +89,20 @@
    <PreferenceCategory
         android:title="@string/qs_show_brightness_slider_title">
 	
-	<com.cherish.settings.preferences.SecureSettingSwitchPreference
+	<com.cherish.settings.preferences.SecureSettingListPreference
         android:key="qs_show_brightness_slider"
         android:title="@string/qs_show_brightness_slider_title"
-        android:summary="@string/qs_show_brightness_slider_summary"
-        android:defaultValue="false" />
-		
-	<com.cherish.settings.preferences.SecureSettingSwitchPreference
-            android:key="qs_show_brightness_slider_show_expanded"
-            android:title="@string/qs_show_brightness_slider_expanded_title"
-            android:summary="@string/qs_show_brightness_slider_expanded_summary"
-            android:defaultValue="true" />
+        android:summary="%s"
+        android:dialogTitle="@string/qs_show_brightness_slider_title"
+        android:entries="@array/qs_show_brightness_slider_entries"
+        android:entryValues="@array/qs_show_brightness_slider_values"
+        android:defaultValue="1" />
 
        <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="qs_brightness_position_bottom"
             android:icon="@drawable/ic_brightness"
             android:title="@string/qs_brightness_position_bottom_title"
             android:summary="@string/qs_brightness_position_bottom_summary"
-            android:dependency="qs_show_brightness_slider_show_expanded"
             android:defaultValue="false" />
 
     <com.cherish.settings.preferences.SecureSettingSwitchPreference