From e4498a5ea630b62a96373e03a2af620fae4a4914 Mon Sep 17 00:00:00 2001
From: Vachounet <vachounet@live.fr>
Date: Wed, 13 Jan 2021 10:39:46 +0100
Subject: [PATCH] Cherish: Allow to switch back to pre P mobile type icon style
 [2/2]
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/drawable/ic_4g_x.xml               | 7 +++++++
 res/values/cherish_strings.xml         | 4 ++++
 res/xml/cherish_settings_statusbar.xml | 9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable/ic_4g_x.xml

diff --git a/res/drawable/ic_4g_x.xml b/res/drawable/ic_4g_x.xml
new file mode 100644
index 0000000..494473b
--- /dev/null
+++ b/res/drawable/ic_4g_x.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M1,21H21V1M19,5.83V19H11V13.83" />
+</vector>
\ No newline at end of file
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 23fac3c..ec6896c 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1050,4 +1050,8 @@
     <string name="qstile_neonlike">Neon Light</string>
     <string name="qstile_oos">Oxygen</string>
     <string name="qstile_triangles">Triangle</string>
+
+    <!-- Show old style mobile data icon -->
+    <string name="use_old_mobiletype_title">Use old style mobile data icons</string>
+    <string name="use_old_mobiletype_summary">Use pre-p mobiletype icons for signal</string>
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 61f35b7..7fb7d59 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -47,10 +47,17 @@
         android:title="@string/show_fourg_title"
         android:summary="@string/show_fourg_summary"
         android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="use_old_mobiletype"
+            android:icon="@drawable/ic_4g_old"
+            android:title="@string/use_old_mobiletype_title"
+            android:summary="@string/use_old_mobiletype_summary"
+            android:defaultValue="false" />
  
         <com.cherish.settings.preferences.SystemSettingSwitchPreference 
          android:key="data_disabled_icon" 
-	 android:icon="@drawable/ic_4g_old"
+	 android:icon="@drawable/ic_4g_x"
          android:title="@string/data_disabled_icon_title" 
          android:summary="@string/data_disabled_icon_summary"
          android:defaultValue="true"/>