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

BatteryBar: Let's keep only statusbar option

Browse Source 
Signed-off-by: ShubhamB <shubhamprince111@gmail.com>
Change-Id: I7fc40df990bcbb3a481f3174f749c9c459d3042b
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
ShubhamB
2020-04-25 16:04:33 +00:00
committed by Hưng Phan
parent ab44d4e5d7
commit 2bef040e34
4 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/cherish_arrays.xml
View File

@@ -215,20 +215,6 @@
</string-array>
<!-- Battery bar -->
<string-array name="battery_bar_entries">
<item>@string/battery_bar_location_hide</item>
<item>@string/battery_bar_location_statusbar</item>
<item>@string/battery_bar_location_top_navbar</item>
<item>@string/battery_bar_location_bottom_navbar</item>
</string-array>
<string-array name="battery_bar_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<string-array name="battery_bar_no_navbar_entries">
<item>@string/battery_bar_location_hide</item>
<item>@string/battery_bar_location_statusbar</item>

3
res/values/cherish_strings.xml
View File

@@ -397,12 +397,9 @@
<!-- Battery Bar -->
<string name="battery_bar_title">Battery bar</string>
<string name="battery_bar_summary">Display and customize battery bar near status bar or navigation bar</string>
<string name="battery_bar">Battery bar location</string>
<string name="battery_bar_no_navbar">Battery bar location</string>
<string name="battery_bar_location_hide">Hide</string>
<string name="battery_bar_location_statusbar">Statusbar</string>
<string name="battery_bar_location_top_navbar">Top of navbar</string>
<string name="battery_bar_location_bottom_navbar">Bottom of navbar</string>
<string name="battery_bar_color">Battery bar color</string>
<string name="battery_bar_charging_color">Battery bar charging color</string>
<string name="battery_bar_battery_low_color">Battery bar low battery color</string>

6
res/xml/battery_settings.xml
View File

@@ -42,12 +42,6 @@
android:key="battery_bar_category"
android:title="@string/battery_bar_title">
<ListPreference
android:key="statusbar_battery_bar_list"
android:title="@string/battery_bar"
android:entries="@array/battery_bar_entries"
android:entryValues="@array/battery_bar_values" />
<ListPreference
android:key="statusbar_battery_bar_no_navbar_list"
android:title="@string/battery_bar_no_navbar"

28
src/com/cherish/settings/fragments/BatterySettings.java
View File

@@ -40,7 +40,6 @@ import com.android.settings.R;
public class BatterySettings extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener {
private static final String PREF_BATT_BAR = "statusbar_battery_bar_list";
private static final String PREF_BATT_BAR_NO_NAVBAR = "statusbar_battery_bar_no_navbar_list";
private static final String PREF_BATT_BAR_STYLE = "statusbar_battery_bar_style";
private static final String PREF_BATT_BAR_COLOR = "statusbar_battery_bar_color";
@@ -61,7 +60,6 @@ public class BatterySettings extends SettingsPreferenceFragment
//private static final int BATTERY_PERCENT_SHOW_INSIDE = 1;
//private static final int BATTERY_PERCENT_SHOW_OUTSIDE = 2;
private ListPreference mBatteryBar;
private ListPreference mBatteryBarNoNavbar;
private ListPreference mBatteryBarStyle;
private CustomSeekBarPreference mBatteryBarThickness;
@@ -88,11 +86,6 @@ public class BatterySettings extends SettingsPreferenceFragment
int intColor;
String hexColor;
mBatteryBar = (ListPreference) prefSet.findPreference(PREF_BATT_BAR);
mBatteryBar.setValue((Settings.System.getInt(resolver, Settings.System.STATUSBAR_BATTERY_BAR, 0)) + "");
mBatteryBar.setSummary(mBatteryBar.getEntry());
mBatteryBar.setOnPreferenceChangeListener(this);
mBatteryBarNoNavbar = (ListPreference) prefSet.findPreference(PREF_BATT_BAR_NO_NAVBAR);
mBatteryBarNoNavbar.setValue((Settings.System.getInt(resolver, Settings.System.STATUSBAR_BATTERY_BAR, 0)) + "");
mBatteryBarNoNavbar.setSummary(mBatteryBarNoNavbar.getEntry());
@@ -155,20 +148,6 @@ public class BatterySettings extends SettingsPreferenceFragment
mBatteryPercent.setSummary(mBatteryPercent.getEntry());
mBatteryPercent.setOnPreferenceChangeListener(this);
/*
boolean hasNavBarByDefault = getResources().getBoolean(
com.android.internal.R.bool.config_showNavigationBar);
boolean enableNavigationBar = Settings.Secure.getInt(resolver,
Settings.Secure.NAVIGATION_BAR_VISIBLE, hasNavBarByDefault ? 1 : 0) == 1;
boolean batteryBarSupported = Settings.Secure.getInt(resolver,
Settings.Secure.NAVIGATION_BAR_MODE, 0) == 0;
if (!enableNavigationBar || !batteryBarSupported) {
*/
prefSet.removePreference(mBatteryBar);
/* } else {
prefSet.removePreference(mBatteryBarNoNavbar);
}*/
updateBatteryBarOptions();
mBatteryPercent.setEnabled(
batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN);
@@ -201,13 +180,6 @@ public class BatterySettings extends SettingsPreferenceFragment
Settings.System.putInt(resolver,
Settings.System.STATUSBAR_BATTERY_BAR_BATTERY_LOW_COLOR, intHex);
return true;
} else if (preference == mBatteryBar) {
int val = Integer.parseInt((String) newValue);
int index = mBatteryBar.findIndexOfValue((String) newValue);
Settings.System.putInt(resolver,
Settings.System.STATUSBAR_BATTERY_BAR, val);
mBatteryBar.setSummary(mBatteryBar.getEntries()[index]);
updateBatteryBarOptions();
} else if (preference == mBatteryBarNoNavbar) {
int val = Integer.parseInt((String) newValue);
int index = mBatteryBarNoNavbar.findIndexOfValue((String) newValue);