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 837e5f2d0c.

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

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

This reverts commit 2a3921c969.

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

This reverts commit 42d357e1a2.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2022-05-08 23:08:46 +07:00
parent 086c474e2a
commit 9dedf283bc
4 changed files with 1 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/values/cherish_arrays.xml
View File

@@ -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>

9
res/values/cherish_strings.xml
View File

@@ -668,15 +668,6 @@
<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>
<string name="media_art_title">Media cover art</string>

14
res/xml/cherish_settings_theme.xml
View File

@@ -18,26 +18,12 @@
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">

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

@@ -69,13 +69,10 @@ 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;
}