From c4589a0e087ee7aa7a59778b35aa0e2f856a7c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Mon, 6 Feb 2023 17:19:56 +0700
Subject: [PATCH] Revert "Cherish:Drop volte/vowifi features"

This reverts commit 07c75efdbe560e504c0c1761230d75b551fe7d51.
---
 res/values/cherish_arrays.xml          | 57 ++++++++++++++++++++++++++
 res/values/cherish_strings.xml         | 38 +++++++++++++++++
 res/xml/cherish_settings_statusbar.xml | 26 ++++++++++++
 3 files changed, 121 insertions(+)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 4570e1f..d61b6fb 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -45,6 +45,63 @@
         <item>4</item>
     </string-array>
 	
+	<!-- VoLTE Icon Type -->
+    <string-array name="volte_icon_type_entries" translatable="false">
+        <item>@string/volte_icon_vivo</item>
+        <item>@string/volte_icon_margaritov2</item>
+        <item>@string/volte_icon_margaritov</item>
+        <item>@string/volte_icon_asus</item>
+        <item>@string/volte_icon_hd</item>
+        <item>@string/volte_icon_hd2</item>
+        <item>@string/volte_icon_miui</item>
+        <item>@string/volte_icon_emui</item>
+        <item>@string/volte_icon_oos</item>
+        <item>@string/volte_icon_volte</item>
+        <item>@string/volte_icon_vo</item>
+		 <item>@string/volte_icon_aris</item>
+        <item>@string/volte_icon_beast</item>
+        <item>@string/volte_icon_ios</item>
+        <item>@string/volte_icon_lr</item>
+        <item>@string/volte_icon_realme</item>
+        <item>@string/volte_icon_typeA</item>
+        <item>@string/volte_icon_typeB</item>
+        <item>@string/volte_icon_typeC</item>
+        <item>@string/volte_icon_typeD</item>
+        <item>@string/volte_icon_typeE</item>
+        <item>@string/volte_icon_vcircle</item>
+        <item>@string/volte_icon_vimeo</item>
+        <item>@string/volte_icon_volit</item>
+        <item>@string/volte_icon_zirco</item>
+    </string-array>
+
+    <string-array name="volte_icon_type_values" translatable="false">
+        <item>10</item>
+        <item>9</item>
+        <item>8</item>
+        <item>4</item>
+        <item>3</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+		<item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+		 <item>23</item>
+		<item>24</item>
+    </string-array>
+	
 	<!-- Battery -->
     <string-array name="status_bar_battery_percent_entries" translatable="false">
         <item>@string/status_bar_battery_percentage_default</item>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index db255a3..cb6961b 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -253,6 +253,44 @@
     <string name="lockscreen_albumart_filter_grayblur">Grayscale and blurred</string>
     <string name="lockscreen_albumart_filter_blur_radius_title">Blur amount for lockscreen media artwork</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_asus">VoLTE Asus 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>
+    <string name="volte_icon_hd2">HD CAF Icon</string>
+    <string name="volte_icon_miui">MIUI 11 Icon</string>
+    <string name="volte_icon_emui">EMUI Icon</string>
+    <string name="volte_icon_margaritov">HD Filled Icon</string>
+    <string name="volte_icon_margaritov2">Margaritov VoLTE Icon</string>
+    <string name="volte_icon_vivo">Vivo Icon</string>
+	<string name="volte_icon_aris">Aris Icon</string>
+    <string name="volte_icon_beast">Aww Icon</string>
+    <string name="volte_icon_ios">Ios Icon</string>
+    <string name="volte_icon_lr">Livenge Icon</string>
+    <string name="volte_icon_realme">Realme Icon</string>
+    <string name="volte_icon_typeA">Mild Icon</string>
+    <string name="volte_icon_typeB">Filth Icon</string>
+    <string name="volte_icon_typeC">Mue Icon</string>
+    <string name="volte_icon_typeD">Sus Icon</string>
+    <string name="volte_icon_typeE">Acherus Icon</string>
+    <string name="volte_icon_vcircle">Circle Icon</string>
+    <string name="volte_icon_vimeo">Vimeo Icon</string>
+    <string name="volte_icon_volit">Volit Icon</string>
+    <string name="volte_icon_zirco">Ziroc Icon</string>
+	
+	 <!-- VoWiFi icon -->
+    <string name="vowifi_icon_title">VoWiFi icon</string>
+    <string name="vowifi_icon_summary">Display VoWiFi icon when available</string>
+    <string name="volte_vowifi_override_title">VoWiFi override</string>
+    <string name="volte_vowifi_override_summary">Hide VoLTE when VoWiFi is available</string>
+	
 	<!-- Statusbar Battery -->
     <string name="battery_style_title">Battery icon style</string>
     <string name="battery_style_summary">Customize battery icons, hide or show percentage</string>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index f430835..6173cdc 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -78,6 +78,32 @@
             android:summary="@string/data_disabled_icon_summary"
             android:defaultValue="true" />
 
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+         android:key="volte_icon_style"
+         android:title="@string/volte_icon_style_title"
+         android:summary="@string/volte_icon_summary"
+            android:defaultValue="0"
+            settings:defaultValueText="@string/disabled"
+            android:max="28"
+            settings:min="0"
+            settings:units="" />
+			
+	<com.cherish.settings.preferences.SystemSettingSeekBarPreference
+            android:key="vowifi_icon_style"
+            android:title="@string/vowifi_icon_title"
+            android:summary="@string/vowifi_icon_summary"
+            android:defaultValue="0"
+            settings:defaultValueText="@string/disabled"
+            android:max="8"
+            settings:min="0"
+            settings:units="" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="volte_vowifi_override"
+            android:title="@string/volte_vowifi_override_title"
+            android:summary="@string/volte_vowifi_override_summary"
+            android:defaultValue="true"/>
+
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="use_old_mobiletype"
             android:title="@string/use_old_mobiletype_title"