From fb8568bd69b61a583455e8ee7632d9ad72cde036 Mon Sep 17 00:00:00 2001
From: SagarMakhar <sagarmakhar@gmail.com>
Date: Wed, 5 Jan 2022 08:34:12 +0700
Subject: [PATCH] Cherish:Fix-up [SQUASH] Port brightness slider changes [2/2]
 Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 8857e6bb1f68c85af995bb29964e11f68990de44
Author: SagarMakhar <sagarmakhar@gmail.com>
Date:   Sat Aug 21 17:04:31 2021 +0000

    Quick QS brightness slider [2/2]

    Change-Id: Ib3990781d5a438b2159fa5a383ba16d64bd42bb6
    Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>

commit a1d31fc792df8fc598c7c2017505b36626afdf9d
Author: Dhina17 <dhinalogu@gmail.com>
Date:   Wed Jul 1 12:53:00 2020 +0530

    qs: Enable adaptive brightness button by default

    Signed-off-by: Dhina17 <dhinalogu@gmail.com>
    Change-Id: Ia241688a6ed87d846b3ab0466b0833106ab6433f
    Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>

commit 423ef8ec6963d40b47b5c50bcb52600910a6809c
Author: Sebastian <xdzienny@gmail.com>
Date:   Sat Jan 6 00:57:17 2018 +0100

    Extensions: Add QS brightness buttons options [2/2]

    Signed-off-by: Adarsh-MR <adarshmr1998@gmail.com>
    Signed-off-by: Vol Zhdanov <wight554@gmail.com>
    Signed-off-by: Shubham Singh <coolsks94@gmail.com>
    Change-Id: I093b6dc6f43193b9713ee9f0d18fcf299c340573
    Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>

commit 88b397eb849810f361c7149340cfddd2510beed1
Author: xyyx <xyyx@mail.ru>
Date:   Fri Aug 31 14:02:12 2018 +0800

    Extensions: add prefs for qs brightness slider (2/2)

    Change-Id: I1cf1ae866af39dca7f40165674fc6066471da679
    Signed-off-by: Shubham Singh <coolsks94@gmail.com>
    Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>

Change-Id: I4f4d50b2b5bfdb3a77b292f63012ee8c200fb255

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/xml/cherish_settings_quicksettings.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 84729e8..1c1e437 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -49,27 +49,25 @@
         android:key="quick_settings_brighness_category"
         android:title="@string/qs_brightness_slider_category">
 
-        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_show_brightness"
             android:title="@string/qs_brightness_slider_title"
             android:summary="@string/qs_brightness_slider_summary"
             android:defaultValue="true"/>
 
-        <com.cherish.settings.preferences.SecureSettingSwitchPreference
-            android:key="sysui_qqs_brightness_slider"
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="qqs_show_brightness"
             android:title="@string/quick_qs_brightness_slider_title"
             android:summary="@string/quick_qs_brightness_slider_summary"
-            android:dependency="qs_show_brightness"
             android:defaultValue="false"/>
 
-        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_show_auto_brightness_button"
             android:title="@string/brightness_icon_title"
             android:summary="@string/brightness_icon_summary"
-            android:defaultValue="true"
-            android:dependency="qs_show_brightness"/>
+            android:defaultValue="false"/>
 
-        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="qs_brightness_position_bottom"
             android:title="@string/qs_brightness_position_bottom_title"
             android:summary="@string/qs_brightness_position_bottom_summary"