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

Cherish: Bring back QS battery estimate toggle

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Sourajit Karmakar
2020-11-17 15:13:53 +09:00
committed by Hưng Phan
parent 907169e1d7
commit fc426c57dd
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/cherish_strings.xml
View File

@@ -961,6 +961,8 @@
<string name="status_bar_battery_percentage_default">Hidden</string> <string name="status_bar_battery_percentage_default">Hidden</string>
<string name="status_bar_battery_percentage_text_inside">Inside the icon</string> <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
<string name="status_bar_battery_percentage_text_next">Next to the icon</string> <string name="status_bar_battery_percentage_text_next">Next to the icon</string>
<string name="qs_battery_percentage_title">QS battery percentage</string>
<string name="qs_battery_percentage_summary">Show battery percentage in the QS header instead of battery estimate</string>
<string name="qs_media_player_title">QS Media player</string> <string name="qs_media_player_title">QS Media player</string>
<string name="qs_media_player_summary_on">Show media player in QS.\nRequires a SystemUI restart</string> <string name="qs_media_player_summary_on">Show media player in QS.\nRequires a SystemUI restart</string>

5
res/xml/cherish_settings_statusbar_battery.xml
View File

@@ -47,4 +47,9 @@
android:summary="%s" android:summary="%s"
android:defaultValue="1" /> android:defaultValue="1" />
<SwitchPreference
android:key="qs_battery_percentage"
android:title="@string/qs_battery_percentage_title"
android:summary="@string/qs_battery_percentage_summary" />
</PreferenceScreen> </PreferenceScreen>

14
src/com/cherish/settings/fragments/fragments/StatusbarBatterySettings.java
View File

@@ -45,6 +45,7 @@ import java.util.List;
public class StatusbarBatterySettings extends SettingsPreferenceFragment implements public class StatusbarBatterySettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener { Preference.OnPreferenceChangeListener {
private static final String QS_BATTERY_PERCENTAGE = "qs_battery_percentage";
private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style"; private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent"; private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
private static final String TEXT_CHARGING_SYMBOL = "text_charging_symbol"; private static final String TEXT_CHARGING_SYMBOL = "text_charging_symbol";
@@ -52,7 +53,7 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
private ListPreference mBatteryPercent; private ListPreference mBatteryPercent;
private ListPreference mBatteryStyle; private ListPreference mBatteryStyle;
private SystemSettingListPreference mChargingSymbol; private SystemSettingListPreference mChargingSymbol;
private SwitchPreference mQsBatteryPercent;
private int mBatteryPercentValue; private int mBatteryPercentValue;
private static final int BATTERY_STYLE_PORTRAIT = 0; private static final int BATTERY_STYLE_PORTRAIT = 0;
@@ -86,6 +87,12 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
mChargingSymbol = (SystemSettingListPreference) findPreference("text_charging_symbol"); mChargingSymbol = (SystemSettingListPreference) findPreference("text_charging_symbol");
mChargingSymbol.setEnabled( mChargingSymbol.setEnabled(
batterystyle != BATTERY_STYLE_PORTRAIT && batterystyle != BATTERY_STYLE_HIDDEN); batterystyle != BATTERY_STYLE_PORTRAIT && batterystyle != BATTERY_STYLE_HIDDEN);
mQsBatteryPercent = (SwitchPreference) findPreference(QS_BATTERY_PERCENTAGE);
mQsBatteryPercent.setChecked((Settings.System.getInt(
getActivity().getApplicationContext().getContentResolver(),
Settings.System.QS_SHOW_BATTERY_PERCENT, 0) == 1));
mQsBatteryPercent.setOnPreferenceChangeListener(this);
} }
@Override @Override
@@ -111,6 +118,11 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
int index = mBatteryPercent.findIndexOfValue((String) newValue); int index = mBatteryPercent.findIndexOfValue((String) newValue);
mBatteryPercent.setSummary(mBatteryPercent.getEntries()[index]); mBatteryPercent.setSummary(mBatteryPercent.getEntries()[index]);
return true; return true;
} else if (preference == mQsBatteryPercent) {
Settings.System.putInt(resolver,
Settings.System.QS_SHOW_BATTERY_PERCENT,
(Boolean) newValue ? 1 : 0);
return true;
} }
return false; return false;
} }