From a8c33adf711522bf35dd6d2f6d7a950a03b6d8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Thu, 15 Jul 2021 23:48:20 +0700
Subject: [PATCH] Revert "Cherish: Introduce moar OS navbar styles [3/3]"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bff89e31241a3f1a7c988e5e7565dee0fe3b662b.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish: Introduce navbar styles [3/3]"

This reverts commit fbb56afb34db761f871bc733c11a4820bc51b7a1.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                 | 28 -------------------
 res/values/cherish_strings.xml                | 14 ----------
 res/xml/cherish_settings_theme.xml            | 10 -------
 .../settings/fragments/ThemeSettings.java     | 27 ------------------
 4 files changed, 79 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index d880aa0..c8425d6 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1294,34 +1294,6 @@
         <item>3</item>
     </string-array>
 	
-	<!-- Navbar name -->
-    <string-array name="navbar_name_entries" translatable="false">
-        <item>@string/theme_navbar_picker_default</item>
-        <item>@string/theme_navbar_picker_android</item>
-        <item>@string/theme_navbar_picker_asus</item>
-        <item>@string/theme_navbar_picker_moto</item>
-        <item>@string/theme_navbar_picker_nexus</item>
-        <item>@string/theme_navbar_picker_old</item>
-        <item>@string/theme_navbar_picker_oneplus</item>
-        <item>@string/theme_navbar_picker_oneui</item>
-        <item>@string/theme_navbar_picker_sammy</item>
-        <item>@string/theme_navbar_picker_tecno</item>
-    </string-array>
-
-    <!-- Navbar style layouts -->
-    <string-array name="navbar_picker_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </string-array>
-	
 	<!-- StatusBar weather settings -->
     <string-array name="status_bar_weather_entries" translatable="false">
         <item>@string/status_bar_weather_hidden</item>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 9c5cc9f..b431b1d 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1252,20 +1252,6 @@
     <string name="alarm_blocker_reload">Reload</string>
     <string name="alarm_blocker_warning_title">Proceed with caution</string>
     <string name="alarm_blocker_warning">Blocking alarms have the potential to cause instability, crashes or data loss.</string>
-	
-	<!-- Navbar Picker -->
-    <string name="theme_navbar_picker_title">Navbar style (for 3-button nav)</string>
-    <string name="theme_navbar_picker_summary">Select navbar style</string>
-    <string name="theme_navbar_picker_default">Default</string>
-    <string name="theme_navbar_picker_oneplus">OnePlus</string>
-    <string name="theme_navbar_picker_oneui">One UI</string>
-    <string name="theme_navbar_picker_tecno">Tecno Camon</string>
-    <string name="theme_navbar_picker_asus">ASUS</string>
-    <string name="theme_navbar_picker_android">Android</string>
-    <string name="theme_navbar_picker_moto">Moto</string>
-    <string name="theme_navbar_picker_nexus">Nexus</string>
-    <string name="theme_navbar_picker_old">Old</string>
-    <string name="theme_navbar_picker_sammy">Samsung</string>
     
     <!-- Lockscreen blur -->
     <string name="lockscreen_blur_title">Background blur</string>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 0719e07..f44abba 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -46,16 +46,6 @@
         android:entryValues="@array/ui_style_selector_values"
         android:persistent="false" />
 
-        <!-- Navbar styles -->
-        <ListPreference
-            android:key="theme_navbar_style"
-            android:title="@string/theme_navbar_picker_title"
-            android:icon="@drawable/ic_arrow"
-            android:dialogTitle="@string/theme_navbar_picker_summary"
-            android:summary="%s"
-            android:entries="@array/navbar_name_entries"
-            android:entryValues="@array/navbar_picker_values"/>
-
         <com.cherish.settings.preferences.SystemSettingListPreference
         android:key="switch_style"
         android:icon="@drawable/ic_switch_theme"
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 6fffe61..9b06f06 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -16,8 +16,6 @@ import android.os.UserHandle;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.os.ServiceManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.content.om.IOverlayManager;
 import android.content.om.OverlayInfo;
 import android.os.RemoteException;
@@ -73,7 +71,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
 	static final int DEFAULT = 0xff1a73e8;
 	private static final String QS_PANEL_COLOR = "qs_panel_color";
 	private static final String SWITCH_STYLE = "switch_style";
-    private static final String PREF_NAVBAR_STYLE = "theme_navbar_style";
 	
     private SystemSettingListPreference mSwitchStyle;
     private ColorPickerPreference mQsPanelColor;
@@ -90,7 +87,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
     private ListPreference mQsHeaderStyle;
     private ListPreference mQsTileStyle;
 	private ListPreference mGesbar;
-     private ListPreference mNavbarPicker;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -108,16 +104,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
         mSwitchStyle.setSummary(mSwitchStyle.getEntry());
         mSwitchStyle.setOnPreferenceChangeListener(this);
 
-        mNavbarPicker = (ListPreference) findPreference(PREF_NAVBAR_STYLE);
-        int navbarStyleValues = getOverlayPosition(ThemesUtils.NAVBAR_STYLES);
-        if (navbarStyleValues != -1) {
-            mNavbarPicker.setValue(String.valueOf(navbarStyleValues + 2));
-        } else {
-            mNavbarPicker.setValue("1");
-        }
-        mNavbarPicker.setSummary(mNavbarPicker.getEntry());
-        mNavbarPicker.setOnPreferenceChangeListener(this);
-
         mUIStyle = (ListPreference) findPreference(UI_STYLE);
         int UIStyle = Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.UI_STYLE, 0);
@@ -280,19 +266,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
             Settings.System.putInt(resolver, Settings.System.SWITCH_STYLE, Integer.valueOf(value));
             int valueIndex = mSwitchStyle.findIndexOfValue(value);
             mSwitchStyle.setSummary(mSwitchStyle.getEntries()[valueIndex]);
-        } else if (preference == mNavbarPicker) {
-            String navbarStyle = (String) objValue;
-            int navbarStyleValue = Integer.parseInt(navbarStyle);
-            mNavbarPicker.setValue(String.valueOf(navbarStyleValue));
-            String overlayName = getOverlayName(ThemesUtils.NAVBAR_STYLES);
-                if (overlayName != null) {
-                    handleOverlays(overlayName, false, mOverlayService);
-                }
-                if (navbarStyleValue > 1) {
-                    handleOverlays(ThemesUtils.NAVBAR_STYLES[navbarStyleValue - 2],
-                            true, mOverlayService);
-            }
-            mNavbarPicker.setSummary(mNavbarPicker.getEntry());
         } else if (preference == mSystemSliderStyle) {
             String slider_style = (String) objValue;
             final Context context = getContext();