From da966c7eb31381de85e8453a292da1e5686b70a6 Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Tue, 1 Dec 2020 19:21:03 +0900
Subject: [PATCH] Cherish: Separate battery estimate from percent for QS [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[spezi77]
* Squashed in: user toggle for 'Always display battery percentage when charging'

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                  |  6 +++---
 res/values/cherish_strings.xml                 | 15 +++++++++++----
 res/xml/cherish_settings_quicksettings.xml     | 17 +++++++++++++++++
 res/xml/cherish_settings_statusbar_battery.xml | 10 ++++++++--
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index cd9f2eb..a75f2e6 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1169,9 +1169,9 @@
 	
 	<!-- Battery percent -->
     <string-array name="battery_percent_entries">
-        <item>@string/status_bar_battery_percentage_default</item>
-        <item>@string/status_bar_battery_percentage_text_inside</item>
-        <item>@string/status_bar_battery_percentage_text_next</item>
+        <item>@string/battery_percentage_default</item>
+        <item>@string/battery_percentage_text_inside</item>
+        <item>@string/battery_percentage_text_next</item>
     </string-array>
 
     <string-array name="battery_percent_values" translatable="false">
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index d598860..6a9b4dd 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1055,8 +1055,15 @@
     <string name="status_bar_battery_style_filled_circle">Filled circle</string>
     <string name="status_bar_battery_style_text">Text</string>
     <string name="status_bar_battery_style_hidden">Hidden</string>
-    <string name="status_bar_battery_percentage_title">Battery percentage</string>
-    <string name="status_bar_battery_percentage_default">Hidden</string>
-    <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
-    <string name="status_bar_battery_percentage_text_next">Next to the icon</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Battery percentage</string>
+    <string name="battery_percentage_default">Hidden (default)</string>
+    <string name="battery_percentage_text_inside">Inside the icon</string>
+    <string name="battery_percentage_text_next">Next to the icon</string>
+    <string name="battery_text_charging_title">Battery percentage when charging</string>
+    <string name="battery_text_charging_summary">Always display battery percentage when charging</string>
+
+    <!-- Battery estimate -->
+    <string name="battery_estimate_title">Battery estimate</string>
+    <string name="battery_estimate_summary">Display estimated remaining battery life when available</string>
 </resources>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index d1221fe..9c6f53f 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -157,6 +157,23 @@
             settings:units="" />
 
         </PreferenceCategory>
+		
+	<!-- Battery percent -->
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="qs_show_battery_percent"
+		android:icon="@drawable/ic_battery_percent"
+        android:title="@string/battery_percentage_title"
+        android:entries="@array/battery_percent_entries"
+        android:entryValues="@array/battery_percent_values"
+        android:defaultValue="0" />
+
+    <!-- Battery estimate -->
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="qs_show_battery_estimate"
+		android:icon="@drawable/ic_battery_percent"
+        android:title="@string/battery_estimate_title"
+        android:summary="@string/battery_estimate_summary"
+        android:defaultValue="true" />
 
        <!-- QS Quick Pull Down -->
     <com.cherish.settings.preferences.SecureSettingSwitchPreference
diff --git a/res/xml/cherish_settings_statusbar_battery.xml b/res/xml/cherish_settings_statusbar_battery.xml
index fa4b905..157cdca 100644
--- a/res/xml/cherish_settings_statusbar_battery.xml
+++ b/res/xml/cherish_settings_statusbar_battery.xml
@@ -31,10 +31,16 @@
 
     <ListPreference
         android:key="status_bar_show_battery_percent"
-        android:title="@string/status_bar_battery_percentage_title"
-        android:dialogTitle="@string/status_bar_battery_percentage_title"
+        android:title="@string/battery_percentage_title"
+        android:dialogTitle="@string/battery_percentage_title"
         android:entries="@array/battery_percent_entries"
         android:entryValues="@array/battery_percent_values"
         android:defaultValue="0" />
+		
+		<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="status_bar_battery_text_charging"
+        android:title="@string/battery_text_charging_title"
+        android:summary="@string/battery_text_charging_summary"
+        android:defaultValue="true" />
 
 </PreferenceScreen>