From 13a8fe00b00c5a1451346490e4c0e4e392752db8 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] 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          | 15 +++++++++++++++
 res/values/cherish_strings.xml         |  9 ++++++++-
 res/xml/cherish_settings_statusbar.xml | 13 +++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 89a2ab4..5b9d618 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -101,4 +101,19 @@
         <item>@string/action_value_custom_action</item>
         <item>@string/action_value_select_app</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 2fcccf5..a8c7187 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -234,8 +234,15 @@
     <string name="show_fourg_title">Show 4G instead of LTE</string>
     <string name="show_fourg_summary">Replaces LTE statusbar indicators with 4G</string>
 
-    <!-- VoLTE switch -->
+    <!-- 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>
 
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 96de1ff..65541e1 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -36,11 +36,20 @@
         android:defaultValue="false" />
 		
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="show_volte"
-		android:icon="@drawable/ic_volte"
+        android:key="show_volte_icon"
+	android:icon="@drawable/ic_volte"
         android:title="@string/volte_switch_title"
         android:summary="@string/volte_switch_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"/>
+
 </PreferenceCategory>
 </PreferenceScreen>