From cb2dd7b7efe21f7040caf8e34ad9e84c0386c207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Wed, 21 Dec 2022 17:53:06 +0700
Subject: [PATCH] Cherish:clean some changes in volte/vowifi
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_attrs.xml           |  1 +
 res/values/cherish_strings.xml         |  6 +++++
 res/xml/cherish_settings_statusbar.xml | 35 +++++++++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/res/values/cherish_attrs.xml b/res/values/cherish_attrs.xml
index 764f7ab..d9fb4c8 100644
--- a/res/values/cherish_attrs.xml
+++ b/res/values/cherish_attrs.xml
@@ -16,6 +16,7 @@
 <resources>
     <!-- Base attributes available to CustomSeekBarPreference. -->
     <declare-styleable name="CustomSeekBarPreference">
+        <attr name="defaultValueText" format="string" />
         <attr name="interval" format="integer" />
         <attr name="min" format="integer" />
         <attr name="units" format="string|reference" />
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 7f971f8..4c48bf6 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -281,6 +281,12 @@
     <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 b3c986f..04e3139 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -77,21 +77,32 @@
             android:title="@string/data_disabled_icon_title"
             android:summary="@string/data_disabled_icon_summary"
             android:defaultValue="true" />
-		
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="show_volte_icon"
-        android:title="@string/volte_switch_title"
-        android:summary="@string/volte_switch_summary"
-        android:defaultValue="true" />
 
-    <com.cherish.settings.preferences.SystemSettingListPreference
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
          android:key="volte_icon_style"
          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"/>
+         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"