From 80cf5bd3f02e1043df7de2436b5a6f1855e5938c Mon Sep 17 00:00:00 2001
From: SagarMakhar <sagarmakhar@gmail.com>
Date: Thu, 4 Nov 2021 14:33:22 +0000
Subject: [PATCH] Cherish:[SQUASH] Port brightness slider changes [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squashed commit of the following:

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

    [2/2] Extensions: Statusbar brightness control

    Change-Id: I59c6e2977eb6399b75eda503fe778ac1e159e010
    Signed-off-by: Josh Fox (XlxFoXxlX) <joshfox87@gmail.com>
    Signed-off-by: Anirudh Gupta <anirudhgupta109@gmail.com>
    Signed-off-by: Shubham Singh <coolsks94@gmail.com>
    Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>

commit 6242c12181a7acfb384308e22d8a41d16f7588d5
Author: Adarsh-MR <adarshmr1998@gmail.com>
Date:   Thu Dec 13 18:48:55 2018 +0530

    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>

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml             | 19 +++++++++++++
 res/xml/cherish_settings_misc.xml          |  6 ++++
 res/xml/cherish_settings_quicksettings.xml | 33 ++++++++++++++++++++++
 3 files changed, 58 insertions(+)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 3fde7cc..9d00b69 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -359,6 +359,21 @@
     <string name="hardware_keys_category">Hardware navigation buttons</string>
     <string name="hardware_keys_disable_title">Disable hardware buttons</string>
 
+    <!-- Quick Settings brightness slider -->
+    <string name="qs_brightness_slider_category">Brightness slider</string>
+    <string name="qs_brightness_slider_title">Show brightness slider</string>
+    <string name="qs_brightness_slider_summary">Show a brightness slider in the quick settings panel</string>
+    <string name="qs_brightness_position_bottom_title">Show brightness slider on bottom</string>
+    <string name="qs_brightness_position_bottom_summary">Show a brightness slider on bottom quick settings</string>
+
+    <!-- Quick Settings brightness icon -->
+    <string name="brightness_icon_title">Adaptive brightness button</string>
+    <string name="brightness_icon_summary">Show adaptive brightness button</string>
+
+    <!-- Quick QS Panel brightness slider -->
+    <string name="quick_qs_brightness_slider_title">Show brightness slider in Quick QS Panel</string>
+    <string name="quick_qs_brightness_slider_summary">Show a brightness slider in the quick qs panel</string>
+
     <!-- QS footer warnings -->
     <string name="qs_footer_warnings_title">QS footer warnings</string>
     <string name="qs_footer_warnings_summary">Display a warning at bottom of QS panel when network is monitored by external apps or vpn</string>
@@ -375,4 +390,8 @@
     <string name="battery_light_full_color">Almost full battery</string>
     <string name="battery_light_reallyfull_color">Full (100) battery</string>
 
+    <!-- Brightness control -->
+    <string name="status_bar_toggle_brightness">Brightness control</string>
+    <string name="status_bar_toggle_brightness_summary">Adjust brightness by sliding across the status bar</string>
+
 </resources>
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index d6dbbe5..e7bae11 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -18,4 +18,10 @@
         android:title="@string/misc_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 		
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="status_bar_brightness_control"
+        android:title="@string/status_bar_toggle_brightness"
+        android:summary="@string/status_bar_toggle_brightness_summary"
+        android:defaultValue="false" />
+		
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 7a37446..eb4b7a9 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -32,6 +32,39 @@
             android:title="@string/qs_edit_title"
             android:summary="@string/qs_edit_summary"
             android:defaultValue="true" />
+			
+		<PreferenceCategory
+        android:key="quick_settings_brighness_category"
+        android:title="@string/qs_brightness_slider_category">
+
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+            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"
+            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
+            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"/>
+
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="qs_brightness_position_bottom"
+            android:title="@string/qs_brightness_position_bottom_title"
+            android:summary="@string/qs_brightness_position_bottom_summary"
+            android:defaultValue="false"
+            android:dependency="qs_show_brightness" />
+
+    </PreferenceCategory>
 
         <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="quick_settings_vibrate"