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

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

Browse Source 
This reverts commit da966c7eb3.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-06-08 02:54:53 +07:00
parent 93742b960a
commit 5d30ff8488
4 changed files with 9 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/cherish_arrays.xml
View File

@@ -949,9 +949,9 @@
<!-- Battery percent -->
<string-array name="battery_percent_entries">
<item>@string/battery_percentage_default</item>
<item>@string/battery_percentage_text_inside</item>
<item>@string/battery_percentage_text_next</item>
<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">

15
res/values/cherish_strings.xml
View File

@@ -957,17 +957,10 @@
<string name="status_bar_battery_style_filled_circle">Filled circle</string>
<string name="status_bar_battery_style_text">Text</string>
<string name="status_bar_battery_style_hidden">Hidden</string>
<!-- Battery percentage -->
<string name="battery_percentage_title">Battery percentage</string>
<string name="battery_percentage_default">Hidden (default)</string>
<string name="battery_percentage_text_inside">Inside the icon</string>
<string name="battery_percentage_text_next">Next to the icon</string>
<string name="battery_text_charging_title">Battery percentage when charging</string>
<string name="battery_text_charging_summary">Always display battery percentage when charging</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="status_bar_battery_percentage_title">Battery percentage</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_next">Next to the icon</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>

17
res/xml/cherish_settings_quicksettings.xml
View File

@@ -185,23 +185,6 @@
settings:units="" />
</PreferenceCategory>
<!-- Battery percent -->
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="qs_show_battery_percent"
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_percentage_title"
android:entries="@array/battery_percent_entries"
android:entryValues="@array/battery_percent_values"
android:defaultValue="0" />
<!-- Battery estimate -->
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="qs_show_battery_estimate"
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_estimate_title"
android:summary="@string/battery_estimate_summary"
android:defaultValue="true" />
<!-- QS Quick Pull Down -->
<com.cherish.settings.preferences.SecureSettingSwitchPreference

10
res/xml/cherish_settings_statusbar_battery.xml
View File

@@ -31,8 +31,8 @@
<ListPreference
android:key="status_bar_show_battery_percent"
android:title="@string/battery_percentage_title"
android:dialogTitle="@string/battery_percentage_title"
android:title="@string/status_bar_battery_percentage_title"
android:dialogTitle="@string/status_bar_battery_percentage_title"
android:entries="@array/battery_percent_entries"
android:entryValues="@array/battery_percent_values"
android:summary="%s"
@@ -46,11 +46,5 @@
android:entryValues="@array/text_charging_symbol_values"
android:summary="%s"
android:defaultValue="1" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_battery_text_charging"
android:title="@string/battery_text_charging_title"
android:summary="@string/battery_text_charging_summary"
android:defaultValue="true" />
</PreferenceScreen>