From 43049fcbf7c80b3bfeb0abdd31481586103ed686 Mon Sep 17 00:00:00 2001
From: AnkitGourav <Ankitgourav035@gmail.com>
Date: Tue, 1 Sep 2020 00:48:16 +0700
Subject: [PATCH] QSHeaderDataUsage: add ability to show daily/monthly [2/2]

Signed-off-by: AnkitGourav <Ankitgourav035@gmail.com>
---
 res/values/cherish_arrays.xml              | 12 ++++++++++++
 res/values/cherish_strings.xml             |  7 +++++--
 res/xml/cherish_settings_quicksettings.xml |  9 +++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 4e366a6..8927959 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -606,6 +606,18 @@
         <item>4</item>
     </string-array>
 
+     <!-- QS Header Data Usage -->
+    <string-array name="qs_datausage_entries" translatable="false">
+        <item>@string/qs_datausage_disabled</item>
+        <item>@string/qs_datausage_daily</item> 
+        <item>@string/qs_datausage_monthly</item>
+    </string-array>
+    <string-array name="qs_datausage_values" translatable="false"> 
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
     <!-- Pulse -->
     <string-array name="pulse_render_mode_entries">
        <item>@string/pulse_render_mode_fading_bars</item>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index ae99737..10ea551 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -656,8 +656,11 @@
     <string name="pulse_ambient_light_layout_solid">Solid</string>
     <string name="pulse_ambient_light_layout_faded">Faded</string>
 
-    <string name="qs_datausage_title">Show data usage in qs header</string>
-    <string name="qs_datausage_subtitle">Shows data usage in quick settings header of sim used for data</string>
+    <!-- QS Header Data Usage -->
+    <string name="qs_datausage_title">Data Usage in QS Header</string>
+    <string name="qs_datausage_disabled">Disabled</string>
+    <string name="qs_datausage_daily">Daily usage</string>
+    <string name="qs_datausage_monthly">Monthly usage</string>
 
     <!-- QS header styles -->
     <string name="qs_header_style_title">QS Header style</string>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 9755f0c..a786b0f 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -62,19 +62,20 @@
       android:summary="@string/enable_clear_all_button_summary"
       android:defaultValue="false" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference 
             android:key="settings_spacer"
             android:icon="@drawable/ic_settings"
             android:title="@string/enable_oneui"
             android:summary="@string/enable_oneui_summary"
             android:defaultValue="true" />
 			
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+	<com.cherish.settings.preferences.SystemSettingListPreference
             android:key="qs_datausage"
 			android:icon="@drawable/ic_data"
             android:title="@string/qs_datausage_title"
-            android:summary="@string/qs_datausage_subtitle"
-            android:defaultValue="false" />
+            android:entries="@array/qs_datausage_entries" 
+        android:entryValues="@array/qs_datausage_values"
+        android:defaultValue="0" />
 
          <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
             android:key="status_bar_custom_header"