From 95e5208d6873e63069dbb3bd2a4aef93666b880c Mon Sep 17 00:00:00 2001
From: minaripenguin <minaripenguin@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:39:52 +0800
Subject: [PATCH] Cherish: Combined signal icons toggle [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                         |  4 ++++
 res/xml/cherish_settings_statusbar.xml                 |  6 ++++++
 .../cherish/settings/fragments/StatusBarSettings.java  | 10 ++++++++++
 3 files changed, 20 insertions(+)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 1251bfc..bf06c61 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -872,4 +872,8 @@
     <string name="smart_pixels_percent">Percent of pixels to disable</string>
     <string name="smart_pixels_shift_title">Burn-in protection</string>
     <string name="smart_pixels_shift_summary">Prevents burn-in on OLED devices by shifting pixels every so often</string>
+
+    <!-- Combined signal icons in status bar -->
+    <string name="combined_status_bar_signal_icons_title">Combined signal icons</string>
+    <string name="combined_status_bar_signal_icons_summary">Enable combined signal icons\n(WARNING: a soft reboot will occur upon enabling combined signal icons)</string>
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 02a6cde..eb04d67 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -78,6 +78,12 @@
             android:summary="@string/data_disabled_icon_summary"
             android:defaultValue="true" />
 
+        <com.cherish.settings.preferences.SystemPropertySwitchPreference
+        android:key="persist.sys.flags.combined_signal_icons"
+        android:title="@string/combined_status_bar_signal_icons_title"
+        android:summary="@string/combined_status_bar_signal_icons_summary"
+        android:defaultValue="false" />
+
     <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="volte_icon_style" 
             android:title="@string/volte_icon_style_title" 
diff --git a/src/com/cherish/settings/fragments/StatusBarSettings.java b/src/com/cherish/settings/fragments/StatusBarSettings.java
index f21e660..f54ae15 100644
--- a/src/com/cherish/settings/fragments/StatusBarSettings.java
+++ b/src/com/cherish/settings/fragments/StatusBarSettings.java
@@ -50,6 +50,8 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
 
     private static final String VOLTE_ICON_STYLE = "volte_icon_style";
     private static final String VOWIFI_ICON_STYLE = "vowifi_icon_style";
+
+    private Preference mCombinedSignalIcons;
     
     private SystemSettingListPreference mVolteIconStyle;
     private SystemSettingListPreference mVowifiIconStyle;
@@ -75,6 +77,9 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
         } else {
             mVolteIconStyle.setEnabled(false);
         }
+
+        mCombinedSignalIcons = findPreference("persist.sys.flags.combined_signal_icons");
+        mCombinedSignalIcons.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -91,6 +96,11 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
                 mVolteIconStyle.setEnabled(false);
             }
             return true;
+        } else if (preference == mCombinedSignalIcons) {
+            boolean value = (Boolean) newValue;
+            Settings.Secure.putIntForUser(getContentResolver(),
+                Settings.Secure.ENABLE_COMBINED_SIGNAL_ICONS, value ? 1 : 0, UserHandle.USER_CURRENT);
+            return true;
         }
         return false;
     }