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

Cherish:Separate battery estimate from percent for QS [2/2]

Browse Source 
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
Pranav Vashi
2020-08-18 08:51:58 +07:00
committed by Hưng Phan
parent e22a7555a7
commit 800fdd4a62
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,12 +193,15 @@
<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 mode -->
<!-- Battery percent -->
<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>
<string name="battery_percentage_estimate">Đã bật (ước tính)</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>
<!-- 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_percent_entries">
<string-array name="battery_percentage_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_percent_values" translatable="false">
<string-array name="battery_percentage_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
@@ -199,21 +199,6 @@
<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>

7
res/values/cherish_strings.xml
View File

@@ -213,12 +213,15 @@
<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>
<!-- Battery mode -->
<!-- Battery percent -->
<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>
<string name="battery_percentage_estimate">Enabled (estimate)</string>
<!-- Battery estimate -->
<string name="battery_estimate_title">Battery estimate</string>
<string name="battery_estimate_summary">Display estimated remaining battery life when available</string>
<!-- Network traffic -->
<string name="traffic_title">Traffic indicators</string>

16
res/xml/cherish_settings_quicksettings.xml
View File

@@ -211,11 +211,19 @@
</PreferenceCategory>
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="qs_battery_mode"
android:key="qs_show_battery_percent"
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_percentage_title"
android:entries="@array/qs_battery_mode_entries"
android:entryValues="@array/qs_battery_mode_values"
android:defaultValue="1" />
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" />
</PreferenceScreen>

4
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_percent_entries"
android:entryValues="@array/battery_percent_values"
android:entries="@array/battery_percentage_entries"
android:entryValues="@array/battery_percentage_values"
android:defaultValue="0" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference