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

7
res/drawable/ic_lighting_bolt.xml
View File

@@ -1,7 +0,0 @@
<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>

9
res/values-vi/cherish_strings.xml
View File

@@ -193,17 +193,12 @@
<string name="status_bar_battery_percentage_text_next">Bên cạnh biểu tượng pin</string>
<string name="status_bar_battery_text_charging_title">Hiển thị phần trăm pin lúc sạc</string>
<string name="status_bar_battery_text_charging_summary">Luôn hiển thị dung lượng pin lúc sạc</string>
<!-- Battery percent -->
<!-- Battery mode -->
<string name="battery_percentage_title">Phần trăm pin</string>
<string name="battery_percentage_off">Tắt</string>
<string name="battery_percentage_next">Bật</string>
<string name="battery_percentage_inside">Đã bật (biểu tượng bên trong)</string>
<!-- Battery estimate -->
<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="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>
<string name="battery_percentage_estimate">Đã bật (ước tính)</string>
<!-- Network traffic -->
<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>

19
res/values/cherish_arrays.xml
View File

@@ -167,13 +167,13 @@
</string-array>
<!-- Battery percent -->
<string-array name="battery_percentage_entries">
<string-array name="battery_percent_entries">
<item>@string/status_bar_battery_percentage_default</item>
<item>@string/status_bar_battery_percentage_text_inside</item>
<item>@string/status_bar_battery_percentage_text_next</item>
</string-array>
<string-array name="battery_percentage_values" translatable="false">
<string-array name="battery_percent_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
@@ -199,6 +199,21 @@
<item>6</item>
</string-array>
<!-- Battery mode -->
<string-array name="qs_battery_mode_entries">
<item>@string/battery_percentage_off</item>
<item>@string/battery_percentage_next</item>
<item>@string/battery_percentage_inside</item>
<item>@string/battery_percentage_estimate</item>
</string-array>
<string-array name="qs_battery_mode_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<!-- Network Traffic Type -->
<string-array name="show_network_traffic_type_entries" translatable="false">
<item>@string/show_network_traffic_up</item>

9
res/values/cherish_strings.xml
View File

@@ -214,18 +214,13 @@
<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_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 mode -->
<string name="battery_percentage_title">Battery percentage</string>
<string name="battery_percentage_off">Disabled</string>
<string name="battery_percentage_next">Enabled</string>
<string name="battery_percentage_inside">Enabled (inside icon)</string>
<!-- Battery estimate -->
<string name="battery_estimate_title">Battery estimate</string>
<string name="battery_estimate_summary">Display estimated remaining battery life when available</string>
<string name="battery_percentage_estimate">Enabled (estimate)</string>
<!-- Network traffic -->
<string name="traffic_title">Traffic indicators</string>

16
res/xml/cherish_settings_quicksettings.xml
View File

@@ -219,19 +219,11 @@
</PreferenceCategory>
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="qs_show_battery_percent"
android:key="qs_battery_mode"
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_percentage_title"
android:entries="@array/battery_percentage_entries"
android:entryValues="@array/battery_percentage_values"
android:defaultValue="2" />
<!-- Battery estimate -->
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="qs_show_battery_estimate"
android:icon="@drawable/ic_battery_full"
android:title="@string/battery_estimate_title"
android:summary="@string/battery_estimate_summary"
android:defaultValue="true" />
android:entries="@array/qs_battery_mode_entries"
android:entryValues="@array/qs_battery_mode_values"
android:defaultValue="1" />
</PreferenceScreen>

11
res/xml/cherish_settings_statusbar.xml
View File

@@ -141,8 +141,8 @@
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_percent_title"
android:dialogTitle="@string/battery_percent_title"
android:entries="@array/battery_percentage_entries"
android:entryValues="@array/battery_percentage_values"
android:entries="@array/battery_percent_entries"
android:entryValues="@array/battery_percent_values"
android:defaultValue="0" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
@@ -152,12 +152,5 @@
android:summary="@string/status_bar_battery_text_charging_summary"
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>
</PreferenceScreen>

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);
}