Cherish:Text battery style: Toggle for bolt icon when charging [2/2].

Signed-off-by: spezi77 <spezi7713@gmx.net>
This commit is contained in:
spezi77
2020-03-13 10:35:23 +01:00
committed by Hưng Phan
parent 80c44664f6
commit b94088a52f
5 changed files with 22 additions and 1 deletions

View File

@@ -0,0 +1,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?android:attr/colorControlNormal" android:pathData="M11 9.47V11H14.76L13 14.53V13H9.24L11 9.47M13 1L6 15H11V23L18 9H13V1Z" />
</vector>

View File

@@ -202,6 +202,8 @@
<!-- Battery estimate --> <!-- Battery estimate -->
<string name="battery_estimate_title">Ước tính pin</string> <string name="battery_estimate_title">Ước tính pin</string>
<string name="battery_estimate_summary">Hiển thị thời lượng pin còn lại ước tính khi có sẵn</string> <string name="battery_estimate_summary">Hiển thị thời lượng pin còn lại ước tính khi có sẵn</string>
<string name="status_bar_battery_bolt_charging_title">Biểu tượng bolt khi sạc</string>
<string name="status_bar_battery_bolt_charging_summary">Luôn hiển thị biểu tượng bolt bên cạnh phần trăm pin khi sạc</string>
<!-- Network traffic --> <!-- Network traffic -->
<string name="traffic_title">Hiển thị tốc độ mạng</string> <string name="traffic_title">Hiển thị tốc độ mạng</string>
<string name="traffic_title_summary">Tùy chỉnh chỉ số lưu lượng mạng</string> <string name="traffic_title_summary">Tùy chỉnh chỉ số lưu lượng mạng</string>

View File

@@ -212,6 +212,8 @@
<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="status_bar_battery_text_charging_title">Battery percentage when charging</string> <string name="status_bar_battery_text_charging_title">Battery percentage when charging</string>
<string name="status_bar_battery_text_charging_summary">Always display battery percentage when charging</string> <string name="status_bar_battery_text_charging_summary">Always display battery percentage when charging</string>
<string name="status_bar_battery_bolt_charging_title">Bolt icon when charging</string>
<string name="status_bar_battery_bolt_charging_summary">Always display a bolt icon next to the battery percentage when charging</string>
<!-- Battery percent --> <!-- Battery percent -->
<string name="battery_percentage_title">Battery percentage</string> <string name="battery_percentage_title">Battery percentage</string>

View File

@@ -152,5 +152,12 @@
android:summary="@string/status_bar_battery_text_charging_summary" android:summary="@string/status_bar_battery_text_charging_summary"
android:defaultValue="true" /> android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_battery_bolt_charging"
android:icon="@drawable/ic_lighting_bolt"
android:title="@string/status_bar_battery_bolt_charging_title"
android:summary="@string/status_bar_battery_bolt_charging_summary"
android:defaultValue="true" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

View File

@@ -42,6 +42,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private static final String STATUS_BAR_CLOCK = "status_bar_clock"; 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_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_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 BATTERY_PERCENTAGE_HIDDEN = "0";
private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style"; private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
@@ -55,6 +56,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private ListPreference mBatteryPercent; private ListPreference mBatteryPercent;
private ListPreference mBatteryStyle; private ListPreference mBatteryStyle;
private SwitchPreference mBatteryCharging; private SwitchPreference mBatteryCharging;
private SwitchPreference mBatteryBolt;
private CustomSeekBarPreference mThreshold; private CustomSeekBarPreference mThreshold;
private SystemSettingSwitchPreference mNetMonitor; private SystemSettingSwitchPreference mNetMonitor;
@@ -75,7 +77,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
mBatteryPercent = (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT); mBatteryPercent = (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);
mBatteryCharging = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_TEXT_CHARGING); mBatteryCharging = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_TEXT_CHARGING);
mBatteryBolt = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_BOLT_CHARGING);
mBatteryStyle = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE); mBatteryStyle = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
int batterystyle = Settings.System.getInt(resolver, int batterystyle = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_Q); Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_Q);
@@ -129,6 +131,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private void updateBatteryOptions(int batterystyle) { private void updateBatteryOptions(int batterystyle) {
boolean enabled = batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN; boolean enabled = batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN;
mBatteryBolt.setEnabled(batterystyle == BATTERY_STYLE_TEXT);
mBatteryCharging.setEnabled(enabled); mBatteryCharging.setEnabled(enabled);
mBatteryPercent.setEnabled(enabled); mBatteryPercent.setEnabled(enabled);
} }