From 3a3df7da3bc23cb05b1e89910f155cdd6e6cbdca Mon Sep 17 00:00:00 2001
From: Sven Dawitz <sven@dawitz.de>
Date: Sun, 17 Nov 2013 23:14:23 -0500
Subject: [PATCH] Forward Port Battery Styles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                    |  9 +++++++++
 res/values/cherish_strings.xml                   |  5 +++++
 res/xml/cherish_settings_statusbar.xml           |  7 ++++++-
 res/xml/statusbar_battery.xml                    |  8 ++++++++
 .../settings/fragments/StatusBarBattery.java     | 16 ++++++++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index a84221c..5cd04d3 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -394,4 +394,13 @@
         <item>1</item>
         <item>2</item>
     </string-array>
+	
+	<string-array name="entries_status_bar_battery" translatable="false">
+        <item>@string/status_bar_battery_style_port</item>
+        <item>@string/status_bar_battery_style_circle</item>
+    </string-array>
+     <string-array name="values_status_bar_battery" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index ed42d1e..3a2f223 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -491,5 +491,10 @@
     <string name="status_bar_battery_percentage_default">Hidden</string>
     <string name="status_bar_battery_percentage_text_next">Next to the icon</string>
     <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
+	
+	<!-- Status bar battery style-->
+    <string name="status_bar_battery_style_title">Battery style</string>
+    <string name="status_bar_battery_style_port">Portrait</string>
+    <string name="status_bar_battery_style_circle">Circle</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 5c203a6..87b30d6 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -100,7 +100,12 @@
                android:key="statusbar_icons_style"
                android:title="@string/statusbar_icons_style"
                android:summary="@string/statusbar_icons_style_summary"
-               android:defaultValue="true" />		
+               android:defaultValue="true" />
+
+        <Preference
+            android:key="battery_settings"
+            android:title="@string/battery_style_category_title"
+            android:fragment="com.cherish.settings.fragments.StatusBarBattery" />			   
 
        <Preference
             android:key="systemui_tuner_statusbar"
diff --git a/res/xml/statusbar_battery.xml b/res/xml/statusbar_battery.xml
index 525648c..31081d7 100644
--- a/res/xml/statusbar_battery.xml
+++ b/res/xml/statusbar_battery.xml
@@ -18,10 +18,18 @@
     android:title="@string/battery_style_category_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <ListPreference
+        android:key="status_bar_battery_style"
+        android:dialogTitle="@string/status_bar_battery_style_title"
+        android:title="@string/status_bar_battery_style_title"
+        android:entries="@array/entries_status_bar_battery"
+        android:entryValues="@array/values_status_bar_battery" />
+
     <ListPreference
         android:key="status_bar_show_battery_percent"
         android:title="@string/status_bar_battery_percentage_title"
         android:dialogTitle="@string/status_bar_battery_percentage_title"
         android:entries="@array/status_bar_battery_percentage_entries"
         android:entryValues="@array/status_bar_battery_percentage_values" />
+
 </PreferenceScreen>
diff --git a/src/com/cherish/settings/fragments/StatusBarBattery.java b/src/com/cherish/settings/fragments/StatusBarBattery.java
index ec17f41..8dad773 100644
--- a/src/com/cherish/settings/fragments/StatusBarBattery.java
+++ b/src/com/cherish/settings/fragments/StatusBarBattery.java
@@ -32,8 +32,10 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 
     private static final String SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
+    private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
 
     private ListPreference mStatusBarBatteryShowPercent;
+    private ListPreference mStatusBarBattery;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -51,6 +53,13 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
         mStatusBarBatteryShowPercent.setValue(String.valueOf(batteryShowPercent));
         mStatusBarBatteryShowPercent.setSummary(mStatusBarBatteryShowPercent.getEntry());
         mStatusBarBatteryShowPercent.setOnPreferenceChangeListener(this);
+
+        mStatusBarBattery = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
+         int batteryStyle = Settings.Secure.getInt(resolver,
+                Settings.Secure.STATUS_BAR_BATTERY_STYLE, 0);
+        mStatusBarBattery.setValue(String.valueOf(batteryStyle));
+        mStatusBarBattery.setSummary(mStatusBarBattery.getEntry());
+        mStatusBarBattery.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -69,6 +78,13 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
             mStatusBarBatteryShowPercent.setSummary(
                     mStatusBarBatteryShowPercent.getEntries()[index]);
             return true;
+        } else if (preference == mStatusBarBattery) {
+            int batteryStyle = Integer.valueOf((String) newValue);
+            int index = mStatusBarBattery.findIndexOfValue((String) newValue);
+            Settings.Secure.putInt(resolver,
+                    Settings.Secure.STATUS_BAR_BATTERY_STYLE, batteryStyle);
+            mStatusBarBattery.setSummary(mStatusBarBattery.getEntries()[index]);
+            return true;
         }
         return false;
     }