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

Revert Old battery styles

Browse Source 
Revert "Cherish:Add option to show battery percent & estimate [2/2]"

This reverts commit 9a8e252169.

Revert "Cherish:Add big and big dotted circle [2/2]"

This reverts commit be26a12a22.

Revert "Cherish:Add Solid battery style from PA [2/2]"

This reverts commit 404108fea3.

Revert "Cherish:Add battery styles and customizations for Android 11 [2/2]"

This reverts commit dca03924b9.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-03-09 09:37:10 +07:00
parent 168ef3331a
commit 7bfdbcccc0
4 changed files with 1 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
res/values/cherish_arrays.xml
View File

@@ -168,86 +168,6 @@
<item>6</item>
<item>7</item>
</string-array>
<string-array name="status_bar_battery_style_entries" translatable="false">
<item>@string/status_bar_battery_style_icon_portrait</item>
<!--<item>@string/status_bar_battery_style_q</item>-->
<item>@string/status_bar_battery_style_circle</item>
<item>@string/status_bar_battery_style_dotted_circle</item>
<item>@string/status_bar_battery_style_big_circle</item>
<item>@string/status_bar_battery_style_big_dotted_circle</item>
<!--<item>@string/status_bar_battery_style_square</item>-->
<!--<item>@string/status_bar_battery_style_text</item>-->
<item>@string/status_bar_battery_style_solid</item>
<item>@string/status_bar_battery_style_hidden</item>
<!--<item>@string/status_bar_battery_style_icon_landscape</item>-->
<!--<item>@string/status_bar_battery_style_solid</item>-->
</string-array>
<string-array name="status_bar_battery_style_values" translatable="false">
<item>0</item>
<!--<item>6</item>-->
<item>1</item>
<item>2</item>
<item>7</item>
<item>8</item>
<!--<item>3</item>-->
<!--<item>4</item>-->
<item>6</item>
<item>5</item>
</string-array>
<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>
<!-- Battery percent -->
<string-array name="status_bar_battery_percentage_entries" translatable="false">
<item>@string/battery_percentage_off</item>
<item>@string/battery_percentage_inside</item>
<item>@string/battery_percentage_next</item>
</string-array>
<string-array name="status_bar_battery_percentage_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<!-- Battery percent position -->
<string-array name="status_bar_battery_text_position_entries" translatable="false">
<item>@string/status_bar_battery_text_position_left</item>
<item>@string/status_bar_battery_text_position_right</item>
</string-array>
<string-array name="status_bar_battery_text_position_values" translatable="false">
<item>0</item>
<item>1</item>
</string-array>
<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>
<item>@string/battery_percentage_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>
<item>4</item>
</string-array>
<!-- Network traffic location -->
<string-array name="network_traffic_location_entries">

46
res/values/cherish_strings.xml
View File

@@ -293,52 +293,6 @@
<string name="global_actions_max_columns_title">Max actions to show</string>
<string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</string>
<!-- Battery Styles -->
<string name="battery_style_category_title">Battery level</string>
<!-- 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>
<string name="battery_percentage_estimate">Enabled (estimate)</string>
<string name="battery_percentage_percentage_estimate">Enabled (percent |estimate)</string>
<!-- Status bar - Battery -->
<string name="status_bar_battery_style_title">Battery style</string>
<string name="status_bar_battery_style_icon_portrait">Icon portrait</string>
<string name="status_bar_battery_style_icon_landscape">Icon landscape</string>
<string name="status_bar_battery_style_circle">Circle</string>
<string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
<string name="status_bar_battery_style_big_circle">Big circle</string>
<string name="status_bar_battery_style_big_dotted_circle">Big dotted circle</string>
<string name="status_bar_battery_style_square">Square</string>
<string name="status_bar_battery_style_solid">Solid</string>
<string name="status_bar_battery_style_text">Text</string>
<string name="status_bar_battery_style_hidden">Hidden</string>
<string name="status_bar_battery_style_q">Q style</string>
<string name="status_bar_battery_style_tile_title">Override battery tile</string>
<string name="status_bar_battery_style_tile_summary">Use same icon style as above in QS battery tile</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>
<!-- Status bar - Battery percentage -->
<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="status_bar_battery_text_position_title">Battery percent position</string>
<string name="status_bar_battery_text_position_left">Left of the icon</string>
<string name="status_bar_battery_text_position_right">Right of 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>
<!-- Statusbar net monitor -->
<string name="traffic_title">Traffic indicators</string>
<string name="network_traffic_state_title">Network traffic</string>

9
res/xml/cherish_settings_quicksettings.xml
View File

@@ -172,14 +172,5 @@
android:title="@string/quick_settings_vibrate_title"
android:summary="@string/quick_settings_vibrate_summary"
android:defaultValue="false"/>
<!-- Battery mode -->
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="qs_battery_mode"
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" />
</PreferenceScreen>

35
res/xml/cherish_settings_statusbar.xml
View File

@@ -40,7 +40,7 @@
android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
</Preference>
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="show_fourg"
android:icon="@drawable/ic_4g"
@@ -104,39 +104,6 @@
android:summary="%s"
android:defaultValue="0"/>
</PreferenceCategory>
<PreferenceCategory
android:key="battery_style_category"
android:title="@string/battery_style_category_title" >
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="status_bar_battery_style"
android:icon="@drawable/ic_battery_styles"
android:title="@string/status_bar_battery_style_title"
android:summary="%s"
android:dialogTitle="@string/status_bar_battery_style_title"
android:entries="@array/status_bar_battery_style_entries"
android:entryValues="@array/status_bar_battery_style_values"
android:defaultValue="0" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="status_bar_show_battery_percent"
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_percentage_title"
android:entries="@array/status_bar_battery_percentage_entries"
android:entryValues="@array/status_bar_battery_percentage_values"
android:summary="%s"
android:defaultValue="0" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_battery_text_charging"
android:icon="@drawable/ic_battery_charging"
android:title="@string/status_bar_battery_text_charging_title"
android:summary="@string/status_bar_battery_text_charging_summary"
android:defaultValue="true" />
<Preference
android:key="battery_bar_category"
android:title="@string/battery_bar_title"