diff --git a/res/drawable/ic_lighting_bolt.xml b/res/drawable/ic_lighting_bolt.xml
deleted file mode 100644
index 40cbea7..0000000
--- a/res/drawable/ic_lighting_bolt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index ea493f5..095c243 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -193,17 +193,12 @@
Bên cạnh biểu tượng pin
Hiển thị phần trăm pin lúc sạc
Luôn hiển thị dung lượng pin lúc sạc
-
+
Phần trăm pin
Tắt
Bật
Đã bật (biểu tượng bên trong)
-
-
- Ước tính pin
- Hiển thị thời lượng pin còn lại ước tính khi có sẵn
- Biểu tượng bolt khi sạc
- Luôn hiển thị biểu tượng bolt bên cạnh phần trăm pin khi sạc
+ Đã bật (ước tính)
Hiển thị tốc độ mạng
Tùy chỉnh chỉ số lưu lượng mạng
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 71e50a9..5641792 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -167,13 +167,13 @@
-
+
- @string/status_bar_battery_percentage_default
- @string/status_bar_battery_percentage_text_inside
- @string/status_bar_battery_percentage_text_next
-
+
- 0
- 1
- 2
@@ -199,6 +199,21 @@
- 6
+
+
+ - @string/battery_percentage_off
+ - @string/battery_percentage_next
+ - @string/battery_percentage_inside
+ - @string/battery_percentage_estimate
+
+
+
+ - 0
+ - 1
+ - 2
+ - 3
+
+
- @string/show_network_traffic_up
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index faa2883..eb6f02b 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -214,18 +214,13 @@
Next to the icon
Battery percentage when charging
Always display battery percentage when charging
- Bolt icon when charging
- Always display a bolt icon next to the battery percentage when charging
-
+
Battery percentage
Disabled
Enabled
Enabled (inside icon)
-
-
- Battery estimate
- Display estimated remaining battery life when available
+ Enabled (estimate)
Traffic indicators
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index ad68a63..9755f0c 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -219,19 +219,11 @@
-
-
-
+ android:entries="@array/qs_battery_mode_entries"
+ android:entryValues="@array/qs_battery_mode_values"
+ android:defaultValue="1" />
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 48ffa93..be0027c 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -141,8 +141,8 @@
android:icon="@drawable/ic_battery_percent"
android:title="@string/battery_percent_title"
android:dialogTitle="@string/battery_percent_title"
- android:entries="@array/battery_percentage_entries"
- android:entryValues="@array/battery_percentage_values"
+ android:entries="@array/battery_percent_entries"
+ android:entryValues="@array/battery_percent_values"
android:defaultValue="0" />
-
-
\ No newline at end of file
diff --git a/src/com/cherish/settings/fragments/StatusBarSettings.java b/src/com/cherish/settings/fragments/StatusBarSettings.java
index 8f25da0..0a33673 100644
--- a/src/com/cherish/settings/fragments/StatusBarSettings.java
+++ b/src/com/cherish/settings/fragments/StatusBarSettings.java
@@ -42,7 +42,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private static final String STATUS_BAR_CLOCK = "status_bar_clock";
private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
private static final String STATUS_BAR_BATTERY_TEXT_CHARGING = "status_bar_battery_text_charging";
- private static final String STATUS_BAR_BATTERY_BOLT_CHARGING = "status_bar_battery_bolt_charging";
private static final String BATTERY_PERCENTAGE_HIDDEN = "0";
private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
@@ -56,7 +55,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private ListPreference mBatteryPercent;
private ListPreference mBatteryStyle;
private SwitchPreference mBatteryCharging;
- private SwitchPreference mBatteryBolt;
private CustomSeekBarPreference mThreshold;
private SystemSettingSwitchPreference mNetMonitor;
@@ -77,7 +75,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
mBatteryPercent = (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);
mBatteryCharging = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_TEXT_CHARGING);
- mBatteryBolt = (SwitchPreference) findPreference(STATUS_BAR_BATTERY_BOLT_CHARGING);
+
mBatteryStyle = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);
int batterystyle = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_BATTERY_STYLE, BATTERY_STYLE_Q);
@@ -131,7 +129,12 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private void updateBatteryOptions(int batterystyle) {
boolean enabled = batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN;
- mBatteryBolt.setEnabled(batterystyle == BATTERY_STYLE_TEXT);
+ if (batterystyle == BATTERY_STYLE_HIDDEN) {
+ mBatteryPercent.setValue(BATTERY_PERCENTAGE_HIDDEN);
+ mBatteryPercent.setSummary(mBatteryPercent.getEntry());
+ Settings.System.putInt(getActivity().getContentResolver(),
+ Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0);
+ }
mBatteryCharging.setEnabled(enabled);
mBatteryPercent.setEnabled(enabled);
}