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

Cherish:Add panelbg style [2/3]

Browse Source 
Signed-off-by: Genkzsz11 <genkzsz11@nusantaradevs.org>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
703joko
2020-12-07 05:10:58 +07:00
committed by Hưng Phan
parent bab44d341a
commit 2e347cf348
4 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/values/cherish_arrays.xml
View File

@@ -1097,4 +1097,19 @@
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
</string-array> </string-array>
<!-- Panel Background Style-->
<string-array name="panel_bg_titles" translatable="false">
<item>@string/panel_default</item>
<item>@string/panel_batik</item>
<item>@string/panel_kece</item>
<item>@string/panel_outline</item>
</string-array>
<string-array name="panel_bg_values" translatable="false">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
</resources> </resources>

8
res/values/cherish_strings.xml
View File

@@ -1009,4 +1009,12 @@
<string name="qs_show_brightness_slider_show_never">Never show</string> <string name="qs_show_brightness_slider_show_never">Never show</string>
<string name="qs_show_brightness_slider_show_expanded">Show when expanded</string> <string name="qs_show_brightness_slider_show_expanded">Show when expanded</string>
<string name="qs_show_brightness_slider_show_always">Show always</string> <string name="qs_show_brightness_slider_show_always">Show always</string>
<!-- Panel Background style -->
<string name="panel_bg_title">Panel background style</string>
<string name="panel_bg_dialog_title">Select panel background model</string>
<string name="panel_default">Default</string>
<string name="panel_batik">Batik</string>
<string name="panel_kece">Kece</string>
<string name="panel_outline">Outline</string>
</resources> </resources>

8
res/xml/cherish_settings_theme.xml
View File

@@ -63,6 +63,14 @@
android:entries="@array/brightness_slider_style_selector_entries" android:entries="@array/brightness_slider_style_selector_entries"
android:entryValues="@array/brightness_slider_style_selector_values" android:entryValues="@array/brightness_slider_style_selector_values"
android:persistent="false" /> android:persistent="false" />
<ListPreference
android:key="panel_bg"
android:icon="@drawable/ic_header"
android:title="@string/panel_bg_title"
android:dialogTitle="@string/panel_bg_dialog_title"
android:entries="@array/panel_bg_titles"
android:entryValues="@array/panel_bg_values" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory

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

@@ -55,6 +55,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
OnPreferenceChangeListener { OnPreferenceChangeListener {
private static final String BRIGHTNESS_SLIDER_STYLE = "brightness_slider_style"; private static final String BRIGHTNESS_SLIDER_STYLE = "brightness_slider_style";
private static final String UI_STYLE = "ui_style"; private static final String UI_STYLE = "ui_style";
private static final String PREF_PANEL_BG = "panel_bg";
private static final String PREF_THEME_SWITCH = "theme_switch"; private static final String PREF_THEME_SWITCH = "theme_switch";
private static final String ACCENT_COLOR = "accent_color"; private static final String ACCENT_COLOR = "accent_color";
private static final String ACCENT_COLOR_PROP = "persist.sys.theme.accentcolor"; private static final String ACCENT_COLOR_PROP = "persist.sys.theme.accentcolor";
@@ -70,6 +71,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
private ListPreference mThemeSwitch; private ListPreference mThemeSwitch;
private ListPreference mBrightnessSliderStyle; private ListPreference mBrightnessSliderStyle;
private ListPreference mUIStyle; private ListPreference mUIStyle;
private ListPreference mPanelBg;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@@ -140,6 +142,16 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
} }
}); });
mPanelBg = (ListPreference) findPreference(PREF_PANEL_BG);
int mPanelValue = getOverlayPosition(ThemesUtils.PANEL_BG_STYLE);
if (mPanelValue != -1) {
mPanelBg.setValue(String.valueOf(mPanelValue + 2));
} else {
mPanelBg.setValue("1");
}
mPanelBg.setSummary(mPanelBg.getEntry());
mPanelBg.setOnPreferenceChangeListener(this);
mUiModeManager = getContext().getSystemService(UiModeManager.class); mUiModeManager = getContext().getSystemService(UiModeManager.class);
mOverlayService = IOverlayManager.Stub mOverlayService = IOverlayManager.Stub
@@ -265,6 +277,21 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT); mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
} catch (RemoteException ignored) { } catch (RemoteException ignored) {
} }
} else if (preference == mPanelBg) {
String panelbg = (String) objValue;
int panelBgValue = Integer.parseInt(panelbg);
mPanelBg.setValue(String.valueOf(panelBgValue));
String overlayName = getOverlayName(ThemesUtils.PANEL_BG_STYLE);
if (overlayName != null) {
handleOverlays(overlayName, false, mOverlayService);
}
if (panelBgValue > 1) {
CherishUtils.showSystemUiRestartDialog(getContext());
handleOverlays(ThemesUtils.PANEL_BG_STYLE[panelBgValue -2],
true, mOverlayService);
}
mPanelBg.setSummary(mPanelBg.getEntry());
} }
return true; return true;
} }