From 2a3921c969aed64d50c9fd3d0fc6a1c700896f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Wed, 23 Mar 2022 08:59:38 +0700
Subject: [PATCH] Revert "TopLevelSettings: custom settings layout [3/3]"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 42d357e1a299d177d4db7d31fe433ff0b646eb0a.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                        | 11 -----------
 res/values/cherish_strings.xml                       |  2 --
 res/xml/cherish_settings_theme.xml                   |  8 --------
 .../cherish/settings/fragments/ThemeSettings.java    | 12 +-----------
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index e4ba7bf..33e9a4d 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -521,17 +521,6 @@
         <item>@string/status_bar_date_format_custom</item>
     </string-array>
 	
-	<!-- Settings dashboard styles-->
-    <string-array name="settings_dashboard_style_entries" translatable="false">
-        <item>@string/settings_dashboard_style_gms</item>
-        <item>@string/settings_dashboard_style_aosp</item>
-    </string-array>
-
-    <string-array name="settings_dashboard_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-	
 	<!-- Lockscreen album art filter -->
     <string-array name="lockscreen_albumart_filter_entries">
         <item>@string/lockscreen_albumart_filter_none</item>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 1059dbf..daf5b32 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -614,8 +614,6 @@
 	
 	<!-- Custom settings dashboard style -->
     <string name="settings_dashboard_style_title">Settings layout</string>
-    <string name="settings_dashboard_style_gms">Default</string>
-    <string name="settings_dashboard_style_aosp">Aosp</string>
     <string name="settings_layout_category_title">Settings UI interface</string>
 
 	<!-- Media art -->
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 372b734..1fb7d82 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -22,14 +22,6 @@
         android:key="settings_layout_category"
         android:title="@string/settings_layout_category_title">
 
-    <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="settings_dashboard_gms"
-            android:title="@string/settings_dashboard_style_title"
-            android:entries="@array/settings_dashboard_style_entries"
-            android:entryValues="@array/settings_dashboard_style_values"
-            android:summary="%s"
-            android:defaultValue="0" />
-
     <com.cherish.settings.preferences.SecureSettingSwitchPreference
         android:key="system_black_theme"
         android:title="@string/system_black_theme_title"
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 5e55213..44c8b73 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -68,15 +68,12 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ThemeSettings extends DashboardFragment implements OnPreferenceChangeListener {
-	
-	private static final String SETTINGS_DASHBOARD_GMS = "settings_dashboard_gms";
 			
 	public static final String TAG = "ThemeSettings";
     static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff;
 	static final int DEFAULT = 0xff1a73e8;
 	private Context mContext;
-	private SystemSettingListPreference mSettingsDashBoardGms;
-	
+
     private IOverlayManager mOverlayService;
     private UiModeManager mUiModeManager;
 	
@@ -110,9 +107,6 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
         ContentResolver resolver = getActivity().getContentResolver();
 		final Resources res = getResources();
 		mContext =  getActivity();
-		
-		mSettingsDashBoardGms = (SystemSettingListPreference) findPreference(SETTINGS_DASHBOARD_GMS);
-        mSettingsDashBoardGms.setOnPreferenceChangeListener(this);
         }
 
     public boolean isAvailable() {
@@ -122,10 +116,6 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-		 if (preference == mSettingsDashBoardGms) {
-            CherishUtils.showSettingsRestartDialog(getContext());
-            return true;
-		 }
         return false;
     }