From e9a95d923c76d70f825a6ef88c825a6d13364033 Mon Sep 17 00:00:00 2001
From: SuperDroidBond <SuperDroidBond@users.noreply.github.com>
Date: Wed, 30 Sep 2020 12:24:30 +0000
Subject: [PATCH] Cherish:VoLTE Icon - User Selectable VoLTE Icon [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1dc8a6cee76dcd5519f5eb1edee0ac620c0a2560
Signed-off-by: Josh Fox (XlxFoXxlX) <joshfox87@gmail.com>
Signed-off-by: DennySPB <dennyspb@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml          | 14 ++++++++++++++
 res/values/cherish_strings.xml         |  7 +++++++
 res/xml/cherish_settings_statusbar.xml | 11 ++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 394a295..2cfe035 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -203,4 +203,18 @@
         <item>2</item>
     </string-array>
 
+    <!-- VoLTE Icon Type -->
+    <string-array name="volte_icon_type_entries" translatable="false">
+        <item>@string/volte_icon_hd</item>
+        <item>@string/volte_icon_oos</item>
+        <item>@string/volte_icon_volte</item>
+        <item>@string/volte_icon_vo</item>
+    </string-array>
+
+    <string-array name="volte_icon_type_values" translatable="false">
+        <item>3</item>
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 35212ca..3f2b11f 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -210,8 +210,15 @@
     <string name="show_fourg_icon_summary">Display 4G icon in signal icon instead LTE</string>
 	
 	<!-- Show VoLTE icon on statusbar -->
+    <string name="volte_switch_title">VoLTE icon</string>
+    <string name="volte_switch_summary">Display VoLTE icon</string>
     <string name="volte_icon_title">VoLTE icon</string>
     <string name="volte_icon_summary">Display VoLTE icon</string>
+    <string name="volte_icon_style_title">Select VoLTE Icon</string>
+    <string name="volte_icon_vo">Vo Only Icon</string>
+    <string name="volte_icon_volte">VoLTE Icon</string>
+    <string name="volte_icon_oos">VoLTE OOS Icon</string>
+    <string name="volte_icon_hd">HD Icon</string>
 	
 	<!-- Volume swap buttons -->
     <string name="swap_volume_buttons_title">Reorient</string>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 09ccbf6..cf6e6c4 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -53,11 +53,20 @@
              android:defaultValue="false"/>
 			 
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-             android:key="volte_icon"
+             android:key="show_volte_icon"
              android:title="@string/volte_icon_title"
              android:summary="@string/volte_icon_summary"
              android:defaultValue="true"/>
 			 
+		<com.cherish.settings.preferences.SystemSettingListPreference
+         android:key="volte_icon_style"
+         android:icon="@drawable/ic_volte"
+         android:title="@string/volte_icon_style_title"
+         android:entries="@array/volte_icon_type_entries"
+         android:entryValues="@array/volte_icon_type_values"
+         android:summary="%s"
+         android:defaultValue="0"/>
+			 
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
              android:key="roaming_indicator_icon"
              android:title="@string/roaming_indicator_icon_title"