psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 42d357e1a2.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2022-03-23 08:59:38 +07:00
parent 6326cc1ab8
commit 2a3921c969
4 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/cherish_arrays.xml
View File

@@ -521,17 +521,6 @@
<item>@string/status_bar_date_format_custom</item> <item>@string/status_bar_date_format_custom</item>
</string-array> </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 --> <!-- Lockscreen album art filter -->
<string-array name="lockscreen_albumart_filter_entries"> <string-array name="lockscreen_albumart_filter_entries">
<item>@string/lockscreen_albumart_filter_none</item> <item>@string/lockscreen_albumart_filter_none</item>

2
res/values/cherish_strings.xml
View File

@@ -614,8 +614,6 @@
<!-- Custom settings dashboard style --> <!-- Custom settings dashboard style -->
<string name="settings_dashboard_style_title">Settings layout</string> <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> <string name="settings_layout_category_title">Settings UI interface</string>
<!-- Media art --> <!-- Media art -->

8
res/xml/cherish_settings_theme.xml
View File

@@ -22,14 +22,6 @@
android:key="settings_layout_category" android:key="settings_layout_category"
android:title="@string/settings_layout_category_title"> 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 <com.cherish.settings.preferences.SecureSettingSwitchPreference
android:key="system_black_theme" android:key="system_black_theme"
android:title="@string/system_black_theme_title" android:title="@string/system_black_theme_title"

12
src/com/cherish/settings/fragments/ThemeSettings.java
View File

@@ -68,15 +68,12 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class ThemeSettings extends DashboardFragment implements OnPreferenceChangeListener { public class ThemeSettings extends DashboardFragment implements OnPreferenceChangeListener {
private static final String SETTINGS_DASHBOARD_GMS = "settings_dashboard_gms";
public static final String TAG = "ThemeSettings"; public static final String TAG = "ThemeSettings";
static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff; static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff;
static final int DEFAULT = 0xff1a73e8; static final int DEFAULT = 0xff1a73e8;
private Context mContext; private Context mContext;
private SystemSettingListPreference mSettingsDashBoardGms;
private IOverlayManager mOverlayService; private IOverlayManager mOverlayService;
private UiModeManager mUiModeManager; private UiModeManager mUiModeManager;
@@ -110,9 +107,6 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
ContentResolver resolver = getActivity().getContentResolver(); ContentResolver resolver = getActivity().getContentResolver();
final Resources res = getResources(); final Resources res = getResources();
mContext = getActivity(); mContext = getActivity();
mSettingsDashBoardGms = (SystemSettingListPreference) findPreference(SETTINGS_DASHBOARD_GMS);
mSettingsDashBoardGms.setOnPreferenceChangeListener(this);
} }
public boolean isAvailable() { public boolean isAvailable() {
@@ -122,10 +116,6 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
@Override @Override
public boolean onPreferenceChange(Preference preference, Object objValue) { public boolean onPreferenceChange(Preference preference, Object objValue) {
ContentResolver resolver = getActivity().getContentResolver(); ContentResolver resolver = getActivity().getContentResolver();
if (preference == mSettingsDashBoardGms) {
CherishUtils.showSettingsRestartDialog(getContext());
return true;
}
return false; return false;
} }