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

Cherish:Cleanup battery estimate for QS [2/2]

Browse Source 
This reverts commit 32e16fdb993da72996aa8814f943e9d063100872.
This commit is contained in:
Hưng Phan
2020-09-01 00:39:04 +07:00
parent 3efbcb9565
commit 54f4f77b82
7 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/cherish/settings/fragments/StatusBarSettings.java
View File

@@ -42,7 +42,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private static final String STATUS_BAR_CLOCK = "status_bar_clock";
private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
private static final String STATUS_BAR_BATTERY_TEXT_CHARGING = "status_bar_battery_text_charging";
private static final String STATUS_BAR_BATTERY_BOLT_CHARGING = "status_bar_battery_bolt_charging";
private static final String BATTERY_PERCENTAGE_HIDDEN = "0";
private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
@@ -56,7 +55,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private ListPreference mBatteryPercent;
private ListPreference mBatteryStyle;
private SwitchPreference mBatteryCharging;
private SwitchPreference mBatteryBolt;
private CustomSeekBarPreference mThreshold;
private SystemSettingSwitchPreference mNetMonitor;
@@ -77,7 +75,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
mBatteryPercent = (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);
mBatteryCharging = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_TEXT_CHARGING);
mBatteryBolt = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_BOLT_CHARGING);
mBatteryStyle = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
int batterystyle = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_Q);
@@ -131,7 +129,12 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private void updateBatteryOptions(int batterystyle) {
boolean enabled = batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN;
mBatteryBolt.setEnabled(batterystyle == BATTERY_STYLE_TEXT);
if (batterystyle == BATTERY_STYLE_HIDDEN) {
mBatteryPercent.setValue(BATTERY_PERCENTAGE_HIDDEN);
mBatteryPercent.setSummary(mBatteryPercent.getEntry());
Settings.System.putInt(getActivity().getContentResolver(),
Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0);
}
mBatteryCharging.setEnabled(enabled);
mBatteryPercent.setEnabled(enabled);
}