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

Revert "Cherish: Introduce moar OS navbar styles [3/3]"

Browse Source 
This reverts commit bff89e3124.

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

Revert "Cherish: Introduce navbar styles [3/3]"

This reverts commit fbb56afb34.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-07-15 23:48:20 +07:00
parent ce3a40ab69
commit a8c33adf71
4 changed files with 0 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/values/cherish_arrays.xml
View File

@@ -1294,34 +1294,6 @@
<item>3</item> <item>3</item>
</string-array> </string-array>
<!-- Navbar name -->
<string-array name="navbar_name_entries" translatable="false">
<item>@string/theme_navbar_picker_default</item>
<item>@string/theme_navbar_picker_android</item>
<item>@string/theme_navbar_picker_asus</item>
<item>@string/theme_navbar_picker_moto</item>
<item>@string/theme_navbar_picker_nexus</item>
<item>@string/theme_navbar_picker_old</item>
<item>@string/theme_navbar_picker_oneplus</item>
<item>@string/theme_navbar_picker_oneui</item>
<item>@string/theme_navbar_picker_sammy</item>
<item>@string/theme_navbar_picker_tecno</item>
</string-array>
<!-- Navbar style layouts -->
<string-array name="navbar_picker_values" translatable="false">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
<item>10</item>
</string-array>
<!-- StatusBar weather settings --> <!-- StatusBar weather settings -->
<string-array name="status_bar_weather_entries" translatable="false"> <string-array name="status_bar_weather_entries" translatable="false">
<item>@string/status_bar_weather_hidden</item> <item>@string/status_bar_weather_hidden</item>

14
res/values/cherish_strings.xml
View File

@@ -1253,20 +1253,6 @@
<string name="alarm_blocker_warning_title">Proceed with caution</string> <string name="alarm_blocker_warning_title">Proceed with caution</string>
<string name="alarm_blocker_warning">Blocking alarms have the potential to cause instability, crashes or data loss.</string> <string name="alarm_blocker_warning">Blocking alarms have the potential to cause instability, crashes or data loss.</string>
<!-- Navbar Picker -->
<string name="theme_navbar_picker_title">Navbar style (for 3-button nav)</string>
<string name="theme_navbar_picker_summary">Select navbar style</string>
<string name="theme_navbar_picker_default">Default</string>
<string name="theme_navbar_picker_oneplus">OnePlus</string>
<string name="theme_navbar_picker_oneui">One UI</string>
<string name="theme_navbar_picker_tecno">Tecno Camon</string>
<string name="theme_navbar_picker_asus">ASUS</string>
<string name="theme_navbar_picker_android">Android</string>
<string name="theme_navbar_picker_moto">Moto</string>
<string name="theme_navbar_picker_nexus">Nexus</string>
<string name="theme_navbar_picker_old">Old</string>
<string name="theme_navbar_picker_sammy">Samsung</string>
<!-- Lockscreen blur --> <!-- Lockscreen blur -->
<string name="lockscreen_blur_title">Background blur</string> <string name="lockscreen_blur_title">Background blur</string>
<string name="lockscreen_blur_disabled">Lock screen Blur cannot be enabled because your current lock screen wallpaper does not match your home screen one, or your device does not support Blur at all.</string> <string name="lockscreen_blur_disabled">Lock screen Blur cannot be enabled because your current lock screen wallpaper does not match your home screen one, or your device does not support Blur at all.</string>

10
res/xml/cherish_settings_theme.xml
View File

@@ -46,16 +46,6 @@
android:entryValues="@array/ui_style_selector_values" android:entryValues="@array/ui_style_selector_values"
android:persistent="false" /> android:persistent="false" />
<!-- Navbar styles -->
<ListPreference
android:key="theme_navbar_style"
android:title="@string/theme_navbar_picker_title"
android:icon="@drawable/ic_arrow"
android:dialogTitle="@string/theme_navbar_picker_summary"
android:summary="%s"
android:entries="@array/navbar_name_entries"
android:entryValues="@array/navbar_picker_values"/>
<com.cherish.settings.preferences.SystemSettingListPreference <com.cherish.settings.preferences.SystemSettingListPreference
android:key="switch_style" android:key="switch_style"
android:icon="@drawable/ic_switch_theme" android:icon="@drawable/ic_switch_theme"

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

@@ -16,8 +16,6 @@ import android.os.UserHandle;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.content.om.IOverlayManager; import android.content.om.IOverlayManager;
import android.content.om.OverlayInfo; import android.content.om.OverlayInfo;
import android.os.RemoteException; import android.os.RemoteException;
@@ -73,7 +71,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
static final int DEFAULT = 0xff1a73e8; static final int DEFAULT = 0xff1a73e8;
private static final String QS_PANEL_COLOR = "qs_panel_color"; private static final String QS_PANEL_COLOR = "qs_panel_color";
private static final String SWITCH_STYLE = "switch_style"; private static final String SWITCH_STYLE = "switch_style";
private static final String PREF_NAVBAR_STYLE = "theme_navbar_style";
private SystemSettingListPreference mSwitchStyle; private SystemSettingListPreference mSwitchStyle;
private ColorPickerPreference mQsPanelColor; private ColorPickerPreference mQsPanelColor;
@@ -90,7 +87,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
private ListPreference mQsHeaderStyle; private ListPreference mQsHeaderStyle;
private ListPreference mQsTileStyle; private ListPreference mQsTileStyle;
private ListPreference mGesbar; private ListPreference mGesbar;
private ListPreference mNavbarPicker;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@@ -108,16 +104,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
mSwitchStyle.setSummary(mSwitchStyle.getEntry()); mSwitchStyle.setSummary(mSwitchStyle.getEntry());
mSwitchStyle.setOnPreferenceChangeListener(this); mSwitchStyle.setOnPreferenceChangeListener(this);
mNavbarPicker = (ListPreference) findPreference(PREF_NAVBAR_STYLE);
int navbarStyleValues = getOverlayPosition(ThemesUtils.NAVBAR_STYLES);
if (navbarStyleValues != -1) {
mNavbarPicker.setValue(String.valueOf(navbarStyleValues + 2));
} else {
mNavbarPicker.setValue("1");
}
mNavbarPicker.setSummary(mNavbarPicker.getEntry());
mNavbarPicker.setOnPreferenceChangeListener(this);
mUIStyle = (ListPreference) findPreference(UI_STYLE); mUIStyle = (ListPreference) findPreference(UI_STYLE);
int UIStyle = Settings.System.getInt(getActivity().getContentResolver(), int UIStyle = Settings.System.getInt(getActivity().getContentResolver(),
Settings.System.UI_STYLE, 0); Settings.System.UI_STYLE, 0);
@@ -280,19 +266,6 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
Settings.System.putInt(resolver, Settings.System.SWITCH_STYLE, Integer.valueOf(value)); Settings.System.putInt(resolver, Settings.System.SWITCH_STYLE, Integer.valueOf(value));
int valueIndex = mSwitchStyle.findIndexOfValue(value); int valueIndex = mSwitchStyle.findIndexOfValue(value);
mSwitchStyle.setSummary(mSwitchStyle.getEntries()[valueIndex]); mSwitchStyle.setSummary(mSwitchStyle.getEntries()[valueIndex]);
} else if (preference == mNavbarPicker) {
String navbarStyle = (String) objValue;
int navbarStyleValue = Integer.parseInt(navbarStyle);
mNavbarPicker.setValue(String.valueOf(navbarStyleValue));
String overlayName = getOverlayName(ThemesUtils.NAVBAR_STYLES);
if (overlayName != null) {
handleOverlays(overlayName, false, mOverlayService);
}
if (navbarStyleValue > 1) {
handleOverlays(ThemesUtils.NAVBAR_STYLES[navbarStyleValue - 2],
true, mOverlayService);
}
mNavbarPicker.setSummary(mNavbarPicker.getEntry());
} else if (preference == mSystemSliderStyle) { } else if (preference == mSystemSliderStyle) {
String slider_style = (String) objValue; String slider_style = (String) objValue;
final Context context = getContext(); final Context context = getContext();