From 9dedf283bcefae943974ce7912cbf8e72a01a705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Sun, 8 May 2022 23:08:46 +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 837e5f2d0c89534049e0d804847b843731e710f4.

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

Revert "Revert "TopLevelSettings: custom settings layout [3/3]""

This reverts commit 2a3921c969aed64d50c9fd3d0fc6a1c700896f3c.

Revert "TopLevelSettings: custom settings layout [3/3]"

This reverts commit 42d357e1a299d177d4db7d31fe433ff0b646eb0a.

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

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 5fabda9..7098595 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -571,23 +571,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_aosp</item>
-        <item>@string/settings_dashboard_style_oos11_gms</item>
-        <item>@string/settings_dashboard_style_oos11_microg</item>
-        <item>@string/settings_dashboard_style_oos12_gms</item>
-        <item>@string/settings_dashboard_style_oos12_microg</item>
-    </string-array>
-
-    <string-array name="settings_dashboard_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</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 fe6119e..03d4f66 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -667,15 +667,6 @@
     <!-- QS date -->
     <string name="qs_date_title">Date</string>
     <string name="qs_date_summary">Display date in quick status bar header</string>
-	
-	<!-- Custom settings dashboard style -->
-    <string name="settings_dashboard_style_title">Settings layout</string>
-    <string name="settings_dashboard_style_aosp">AOSP</string>
-    <string name="settings_dashboard_style_oos11_gms">OOS11 Gapps</string>
-    <string name="settings_dashboard_style_oos11_microg">OOS11 MicroG</string>
-    <string name="settings_dashboard_style_oos12_gms">OOS12 Gapps</string>
-    <string name="settings_dashboard_style_oos12_microg">OOS12 MicroG</string>
-    <string name="settings_layout_category_title">Settings UI interface</string>
 
 	<!-- Media art -->
     <string name="lockscreen_media_category">Lock screen media</string>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index eb147c1..6bfba62 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -18,25 +18,11 @@
         android:title="@string/theme_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-		<PreferenceCategory
-        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"
         android:summary="@string/system_black_theme_summary"
         android:defaultValue="false" />
-
-    </PreferenceCategory>
 	
 	<PreferenceCategory
         android:title="@string/notification_material_dismiss_button_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;
     }