From fef56edee26432bbb8bad0aeb609dcf612a995b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Sat, 22 May 2021 16:01:05 +0700
Subject: [PATCH] Cherish:Remove Vowifi and VoLTE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml          | 61 --------------------------
 res/values/cherish_strings.xml         | 31 -------------
 res/xml/cherish_settings_statusbar.xml | 35 ---------------
 3 files changed, 127 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 90f1746..cf66a8d 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -117,67 +117,6 @@
         <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_vo</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_oos10</item>
-    </string-array>
-
-    <string-array name="volte_icon_type_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-    </string-array>
-
-    <!-- VoWiFi Icon -->
-    <string-array name="vowifi_icon_entries" translatable="false">
-        <item>@string/vowifi_icon_disabled</item>
-        <item>@string/vowifi_icon_enabled</item>
-        <item>@string/vowifi_icon_enabled_volte_disabled</item>
-    </string-array>
-
-    <string-array name="vowifi_icon_values" translatable="false">
-        <item>0</item>
-        <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>
-        <item>@string/vowifi_icon_simple1</item>
-        <item>@string/vowifi_icon_simple2</item>
-        <item>@string/vowifi_icon_simple3</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>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
-
     <!-- Network traffic location -->
     <string-array name="network_traffic_location_entries">
         <item>@string/traffic_disabled</item>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 6f94142..ce0c428 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -234,41 +234,10 @@
     <string name="show_fourg_title">Show 4G instead of LTE</string>
     <string name="show_fourg_summary">Replaces LTE statusbar indicators with 4G</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_oos10">OOS 10 Icon</string>
-
     <!-- Three-fingers-swipe to screenshot -->
     <string name="three_finger_gesture">Swipe to screenshot</string>
     <string name="three_finger_gesture_summary">Swipe three fingers to take screenshot</string>
 
-    <!-- VoWiFi icon -->
-    <string name="vowifi_icon_title">VoWiFi icon</string>
-    <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>
-    <string name="vowifi_icon_simple1">Simple1 Icon</string>
-    <string name="vowifi_icon_simple2">Simple2 Icon</string>
-    <string name="vowifi_icon_simple3">Simple3 Icon</string>
-
     <!-- Suppress notifications sound/vibration if screen is ON -->
     <string name="notification_sound_vib_screen_on_title">Notification sound if active</string>
     <string name="notification_sound_vib_screen_on_summary">Play sound and vibration for notifications when screen is on</string>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index d873a81..9c7e8ce 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -68,41 +68,6 @@
             android:title="@string/roaming_indicator_icon_title"
             android:summary="@string/roaming_indicator_icon_summary"
             android:defaultValue="true"/>
-		
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        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"
-         android:dependency="show_volte_icon"/>
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-         android:key="vowifi_icon"
-	 android:icon="@drawable/ic_vowifi"
-         android:title="@string/vowifi_icon_title"
-         android:entries="@array/vowifi_icon_entries"
-         android:entryValues="@array/vowifi_icon_values"
-         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"/>
 
     <Preference
             android:key="battery_bar_category"