From 976fa6a90411f3cf0eeabfeeb6691b7f26f874a6 Mon Sep 17 00:00:00 2001
From: DennySPB <DennySPB@users.noreply.github.com>
Date: Wed, 30 Sep 2020 12:46:03 +0000
Subject: [PATCH] Add four more selectable VoWiFi icons [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie185d857649a49323460a2a91acbbd049acc8a29
Signed-off-by: DennySPb <dennyspb@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml          | 17 +++++++++++++++++
 res/values/cherish_strings.xml         | 10 ++++++++--
 res/xml/cherish_settings_statusbar.xml | 10 ++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 78a6cc4..c5e261f 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -137,4 +137,21 @@
         <item>1</item>
         <item>2</item>
     </string-array>
+
+    <!-- VoWiFi icon style -->
+    <string-array name="vowifi_icon_style_entries" translatable="false">
+        <item>@string/vowifi_icon_default</item>
+        <item>@string/vowifi_icon_oneplus</item>
+        <item>@string/vowifi_icon_moto</item>
+        <item>@string/vowifi_icon_asus</item>
+        <item>@string/vowifi_icon_emui</item>
+    </string-array>
+
+    <string-array name="vowifi_icon_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index b223174..afe7f9b 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -246,8 +246,8 @@
     <string name="volte_icon_oos">VoLTE OOS Icon</string>
     <string name="volte_icon_hd">HD Icon</string>
     <string name="volte_icon_hd2">HD CAF Icon</string>
-    <string name="volte_icon_miui">MIUI 11</string>
-    <string name="volte_icon_emui">EMUI</string>
+    <string name="volte_icon_miui">MIUI 11 Icon</string>
+    <string name="volte_icon_emui">EMUI Icon</string>
 
     <!-- Three-fingers-swipe to screenshot -->
     <string name="three_finger_gesture">Swipe to screenshot</string>
@@ -258,5 +258,11 @@
     <string name="vowifi_icon_enabled">VoWiFi icon enabled</string>
     <string name="vowifi_icon_disabled">VoWiFi icon disabled</string>
     <string name="vowifi_icon_enabled_volte_disabled">VoWiFi instead of VoLTE icon</string>
+    <string name="vowifi_icon_style_title">VoWiFi icon style</string>
+    <string name="vowifi_icon_default">Default Icon</string>
+    <string name="vowifi_icon_emui">EMUI Icon</string>
+    <string name="vowifi_icon_asus">Asus Icon</string>
+    <string name="vowifi_icon_oneplus">OOS Icon</string>
+    <string name="vowifi_icon_moto">Motorola Icon</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index e42860b..3ec88a1 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -61,5 +61,15 @@
          android:summary="%s"
          android:defaultValue="0"/>
 
+    <com.cherish.settings.preferences.SystemSettingListPreference
+         android:key="vowifi_icon_style"
+         android:icon="@drawable/ic_vowifi"
+         android:title="@string/vowifi_icon_style_title"
+         android:entries="@array/vowifi_icon_style_entries"
+         android:entryValues="@array/vowifi_icon_style_values"
+         android:summary="%s"
+         android:defaultValue="0"/>
+
+
 </PreferenceCategory>
 </PreferenceScreen>