From b0292b2445b33675c731f1b16d15670648379457 Mon Sep 17 00:00:00 2001
From: Danesh M <daneshm90@gmail.com>
Date: Wed, 28 Oct 2015 14:07:03 -0700
Subject: [PATCH] BatteryMeterDrawable: add text style (2/2)
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                        |  2 ++
 res/values/cherish_strings.xml                       |  1 +
 .../cherish/settings/fragments/StatusBarBattery.java | 12 ++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 5cd04d3..36e7bf7 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -398,9 +398,11 @@
 	<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>
+		<item>@string/status_bar_battery_style_text</item>
     </string-array>
      <string-array name="values_status_bar_battery" translatable="false">
         <item>0</item>
         <item>1</item>
+        <item>2</item>
     </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 3a2f223..aa2b800 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -496,5 +496,6 @@
     <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>
+    <string name="status_bar_battery_style_text">Text</string>
 
 </resources>
diff --git a/src/com/cherish/settings/fragments/StatusBarBattery.java b/src/com/cherish/settings/fragments/StatusBarBattery.java
index ef75942..734b6e8 100644
--- a/src/com/cherish/settings/fragments/StatusBarBattery.java
+++ b/src/com/cherish/settings/fragments/StatusBarBattery.java
@@ -34,6 +34,8 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
     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 static final int STATUS_BAR_BATTERY_STYLE_TEXT = 2;
+
     private ListPreference mStatusBarBatteryShowPercent;
     private ListPreference mStatusBarBattery;
 
@@ -59,6 +61,7 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
                 Settings.Secure.STATUS_BAR_BATTERY_STYLE, 0);
         mStatusBarBattery.setValue(String.valueOf(batteryStyle));
         mStatusBarBattery.setSummary(mStatusBarBattery.getEntry());
+        enableStatusBarBatteryDependents(batteryStyle);
         mStatusBarBattery.setOnPreferenceChangeListener(this);
     }
 
@@ -84,8 +87,17 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
             Settings.Secure.putInt(resolver,
                     Settings.Secure.STATUS_BAR_BATTERY_STYLE, batteryStyle);
             mStatusBarBattery.setSummary(mStatusBarBattery.getEntries()[index]);
+            enableStatusBarBatteryDependents(batteryStyle);
             return true;
         }
         return false;
     }
+
+    private void enableStatusBarBatteryDependents(int batteryIconStyle) {
+        if (batteryIconStyle == STATUS_BAR_BATTERY_STYLE_TEXT) {
+            mStatusBarBatteryShowPercent.setEnabled(false);
+        } else {
+            mStatusBarBatteryShowPercent.setEnabled(true);
+        }
+    }
 }