Cherish: Add battery styles and customizations for Android 10 [2/2]

Allows the user to tune:
- battery styles
- battery percentage

rcstar6696:
- Adapted to our battery stylesAdd battery styles and customizations for Android 10 [2/2]

Change-Id: I6075e1a70a7a3c111daa24d913953111776bceb0
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

res/values/cherish_arrays.xml

@@ -265,4 +265,35 @@
         <item>3</item>
     </string-array>
 
+    <!-- Battery percent -->
+    <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_percent_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Battery -->
+    <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_circle</item>
+        <item>@string/status_bar_battery_style_dotted_circle</item>
+        <item>@string/status_bar_battery_style_filled_circle</item>
+        <item>@string/status_bar_battery_style_text</item>
+        <item>@string/status_bar_battery_style_hidden</item>
+    </string-array>
+    <string-array name="status_bar_battery_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
 </resources>

res/values/cherish_strings.xml

@@ -457,4 +457,26 @@
     <string name="charging_animation_title">Charging animation</string>
     <string name="charging_animation_summary">Display an animation when the device is plugged in</string>
 
-</resources>
+   <!-- Battery Settings -->
+    <string name="battery_settings_title">Battery Settings</string>   
+
+    <!-- Battery Styles -->
+    <string name="battery_style_category_title">Battery styles</string>
+    <string name="battery_percent_title">Battery percent</string>
+
+    <!-- Status bar - Battery -->
+    <string name="status_bar_battery_style_title">Battery style</string>
+    <string name="status_bar_battery_style_icon_portrait">Icon portrait (default)</string>
+    <string name="status_bar_battery_style_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Circle (Dotted)</string>
+    <string name="status_bar_battery_style_filled_circle">Circle (Filled)</string>
+    <string name="status_bar_battery_style_text">Text</string>
+    <string name="status_bar_battery_style_hidden">Hidden</string>
+
+    <!-- Status bar - Battery percentage -->
+    <string name="status_bar_battery_percentage_title">Battery percentage</string>
+    <string name="status_bar_battery_percentage_default">Hidden (default)</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>  
+
+</resources>

res/xml/battery_settings.xml

@@ -11,10 +11,37 @@
      limitations under the License.
 -->
 <PreferenceScreen
-    android:title="@string/battery_bar_title"
+    android:title="@string/battery_settings_title"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <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: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:title="@string/battery_percent_title"
+            android:dialogTitle="@string/battery_percent_title"
+            android:entries="@array/battery_percent_entries"
+            android:entryValues="@array/battery_percent_values"
+            android:defaultValue="0" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="battery_bar_category"
+        android:title="@string/battery_bar_title">
+
     <ListPreference
         android:key="statusbar_battery_bar_list"
         android:title="@string/battery_bar"
@@ -37,7 +64,7 @@
         android:title="@string/battery_bar_battery_low_color"
         android:defaultValue="0xffffff" />
 
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="statusbar_battery_bar_enable_charging_color"
         android:title="@string/battery_bar_use_charging_color"
         android:defaultValue="true" />
@@ -54,7 +81,7 @@
         android:summary="@string/battery_bar_blend_color_summary"
         android:defaultValue="false" />
 
-    <con.cherish.settings.preferences.SystemSettingSwitchPreference
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="statusbar_battery_bar_blend_color_reverse"
         android:title="@string/battery_bar_blend_color_reverse_title"
         android:summaryOn="@string/battery_bar_blend_color_reverse_summary_on"
@@ -68,7 +95,7 @@
         android:entries="@array/battery_bar_style_entries"
         android:entryValues="@array/battery_bar_style_values" />
 
-    <con.cherish.settings.preferences.CustomSeekBarPreference
+    <com.cherish.settings.preferences.CustomSeekBarPreference
         android:key="statusbar_battery_bar_thickness"
         android:title="@string/battery_bar_thickness_title"
         android:max="4"
@@ -80,4 +107,5 @@
         android:key="statusbar_battery_bar_animate"
         android:title="@string/battery_bar_animate_title" />
 
-</PreferenceScreen>
+   </PreferenceCategory>
+</PreferenceScreen>

res/xml/cherish_settings_statusbar.xml

@@ -94,8 +94,8 @@
 		
 		<Preference
         android:key="battery_bar_category"
-        android:fragment="com.cherish.settings.fragments.BatteryBar"
-        android:title="@string/battery_bar_title" />
+        android:fragment="com.cherish.settings.fragments.BatterySettings"
+        android:title="@string/battery_settings_title" />
 
     </PreferenceCategory>