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

Cherish: Allow setting custom symbol near text on charging [2/2]

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
neobuddy89
2021-01-25 23:25:05 +05:30
committed by Hưng Phan
parent ee57fca863
commit 8dbd03a32e
4 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/values/cherish_arrays.xml
View File

@@ -1254,4 +1254,17 @@
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
</string-array> </string-array>
<!-- Status bar - Battery custom charging symbol -->
<string-array name="text_charging_symbol_entries" translatable="false">
<item>@string/text_charging_symbol_default</item>
<item>@string/text_charging_symbol_flash</item>
<item>@string/text_charging_symbol_tilde</item>
</string-array>
<string-array name="text_charging_symbol_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
</resources> </resources>

7
res/values/cherish_strings.xml
View File

@@ -1178,4 +1178,11 @@
<!-- Power menu background opacity --> <!-- Power menu background opacity -->
<string name="power_menu_alpha_title">Power menu opacity</string> <string name="power_menu_alpha_title">Power menu opacity</string>
<!-- Status bar - Battery custom charging symbol -->
<string name="text_charging_symbol_title">Custom charging symbol for text style</string>
<string name="text_charging_symbol_dialog">Custom charging symbol near battery percentage text</string>
<string name="text_charging_symbol_default">Disabled</string>
<string name="text_charging_symbol_flash">Flash</string>
<string name="text_charging_symbol_tilde">Tilde</string>
</resources> </resources>

10
res/xml/cherish_settings_statusbar_battery.xml
View File

@@ -35,8 +35,18 @@
android:dialogTitle="@string/battery_percentage_title" android:dialogTitle="@string/battery_percentage_title"
android:entries="@array/battery_percent_entries" android:entries="@array/battery_percent_entries"
android:entryValues="@array/battery_percent_values" android:entryValues="@array/battery_percent_values"
android:summary="%s"
android:defaultValue="0" /> android:defaultValue="0" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="text_charging_symbol"
android:title="@string/text_charging_symbol_title"
android:dialogTitle="@string/text_charging_symbol_dialog"
android:entries="@array/text_charging_symbol_entries"
android:entryValues="@array/text_charging_symbol_values"
android:summary="%s"
android:defaultValue="1" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference <com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_battery_text_charging" android:key="status_bar_battery_text_charging"
android:title="@string/battery_text_charging_title" android:title="@string/battery_text_charging_title"

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

@@ -36,6 +36,7 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.cherish.settings.preferences.SystemSettingListPreference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -46,9 +47,11 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
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 ListPreference mBatteryPercent; private ListPreference mBatteryPercent;
private ListPreference mBatteryStyle; private ListPreference mBatteryStyle;
private SystemSettingListPreference mChargingSymbol;
private int mBatteryPercentValue; private int mBatteryPercentValue;
@@ -79,6 +82,10 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
mBatteryPercent.setOnPreferenceChangeListener(this); mBatteryPercent.setOnPreferenceChangeListener(this);
mBatteryPercent.setEnabled( mBatteryPercent.setEnabled(
batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN); batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN);
mChargingSymbol = (SystemSettingListPreference) findPreference("text_charging_symbol");
mChargingSymbol.setEnabled(
batterystyle != BATTERY_STYLE_PORTRAIT && batterystyle != BATTERY_STYLE_HIDDEN);
} }
@Override @Override
@@ -93,6 +100,8 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
mBatteryStyle.setSummary(mBatteryStyle.getEntries()[index]); mBatteryStyle.setSummary(mBatteryStyle.getEntries()[index]);
mBatteryPercent.setEnabled( mBatteryPercent.setEnabled(
batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN); batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN);
mChargingSymbol.setEnabled(
batterystyle != BATTERY_STYLE_PORTRAIT && batterystyle != BATTERY_STYLE_HIDDEN);
return true; return true;
} else if (preference == mBatteryPercent) { } else if (preference == mBatteryPercent) {
mBatteryPercentValue = Integer.parseInt((String) newValue); mBatteryPercentValue = Integer.parseInt((String) newValue);