From 837e5f2d0c89534049e0d804847b843731e710f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Tue, 29 Mar 2022 19:31:26 +0700
Subject: [PATCH] Revert "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 2a3921c969aed64d50c9fd3d0fc6a1c700896f3c.

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

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 33e9a4d..94e543e 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -521,6 +521,23 @@
         <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 65c2fa2..7eb964e 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -638,6 +638,11 @@
 	
 	<!-- 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 -->
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 69bb6b2..f6e9896 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -17,6 +17,20 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         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" />
+
+    </PreferenceCategory>
 	
 	<PreferenceCategory
         android:title="@string/theme_customization_category">
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 44c8b73..5e55213 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -68,12 +68,15 @@ 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;
 	
@@ -107,6 +110,9 @@ 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() {
@@ -116,6 +122,10 @@ 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;
     }