diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml index d7d4cec..6289ec0 100644 --- a/res/values/cherish_arrays.xml +++ b/res/values/cherish_arrays.xml @@ -266,7 +266,9 @@ - @string/status_bar_battery_style_icon_portrait + @string/status_bar_battery_style_icon_portrait + @string/status_bar_battery_style_icon_rlandscape + @string/status_bar_battery_style_icon_landscape @string/status_bar_battery_style_circle @string/status_bar_battery_style_dotted_circle @string/status_bar_battery_style_filled_circle @@ -280,6 +282,8 @@ 3 4 5 + 6 + 7 diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 1206d91..8e26705 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -465,6 +465,8 @@ Battery style Icon portrait (default) + Icon landscape R + Icon landscape L Circle Circle (Dotted) Circle (Filled) @@ -475,7 +477,9 @@ Battery percentage Hidden (default) Inside the icon - Next to the icon + Outside the icon + Left battery text + Put the battery text on left of battery icon Show call strength icon(s) diff --git a/res/xml/battery_settings.xml b/res/xml/battery_settings.xml index 4a92b06..57c0614 100644 --- a/res/xml/battery_settings.xml +++ b/res/xml/battery_settings.xml @@ -19,22 +19,28 @@ android:key="battery_style_category" android:title="@string/battery_style_category_title" > - + + + + 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" /> diff --git a/src/com/cherish/settings/fragments/BatterySettings.java b/src/com/cherish/settings/fragments/BatterySettings.java index fc693dc..4966635 100644 --- a/src/com/cherish/settings/fragments/BatterySettings.java +++ b/src/com/cherish/settings/fragments/BatterySettings.java @@ -34,6 +34,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsPreferenceFragment; import net.margaritov.preference.colorpicker.ColorPickerPreference; + +import com.cherish.settings.preferences.SystemSettingListPreference; +import com.cherish.settings.preferences.SystemSettingSwitchPreference; import com.cherish.settings.preferences.CustomSeekBarPreference; import com.android.settings.R; @@ -52,10 +55,11 @@ public class BatterySettings extends SettingsPreferenceFragment private static final String PREF_BATT_BLEND_COLOR_REVERSE = "statusbar_battery_bar_blend_color_reverse"; private static final String PREF_STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent"; private static final String PREF_STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style"; + private static final String LEFT_BATTERY_TEXT = "do_left_battery_text"; private static final int BATTERY_STYLE_PORTRAIT = 0; - private static final int BATTERY_STYLE_TEXT = 4; - private static final int BATTERY_STYLE_HIDDEN = 5; + private static final int BATTERY_STYLE_TEXT = 6; + private static final int BATTERY_STYLE_HIDDEN = 7; private static final int BATTERY_PERCENT_HIDDEN = 0; //private static final int BATTERY_PERCENT_SHOW_INSIDE = 1; //private static final int BATTERY_PERCENT_SHOW_OUTSIDE = 2; @@ -72,6 +76,7 @@ public class BatterySettings extends SettingsPreferenceFragment private ColorPickerPreference mBatteryBarBatteryLowColor; private ListPreference mBatteryPercent; private ListPreference mBatteryStyle; + private SystemSettingSwitchPreference mLeftBatteryText; private int mBatteryPercentValue; @Override @@ -139,6 +144,11 @@ public class BatterySettings extends SettingsPreferenceFragment mBatteryStyle.setValue(String.valueOf(batterystyle)); mBatteryStyle.setSummary(mBatteryStyle.getEntry()); mBatteryStyle.setOnPreferenceChangeListener(this); + + mLeftBatteryText = (SystemSettingSwitchPreference) findPreference(LEFT_BATTERY_TEXT); + mLeftBatteryText.setChecked((Settings.System.getInt(resolver, + Settings.System.DO_LEFT_BATTERY_TEXT, 0) == 1)); + mLeftBatteryText.setOnPreferenceChangeListener(this); mBatteryPercentValue = Settings.System.getIntForUser(getContentResolver(), Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, BATTERY_PERCENT_HIDDEN, UserHandle.USER_CURRENT); @@ -213,6 +223,8 @@ public class BatterySettings extends SettingsPreferenceFragment mBatteryStyle.setSummary(mBatteryStyle.getEntries()[index]); mBatteryPercent.setEnabled( batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN); + mLeftBatteryText.setEnabled( + batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN); return true; } else if (preference == mBatteryPercent) { mBatteryPercentValue = Integer.parseInt((String) newValue); @@ -222,6 +234,11 @@ public class BatterySettings extends SettingsPreferenceFragment int index = mBatteryPercent.findIndexOfValue((String) newValue); mBatteryPercent.setSummary(mBatteryPercent.getEntries()[index]); return true; + } else if (preference == mLeftBatteryText) { + boolean value = (Boolean) newValue; + Settings.System.putInt(resolver, + Settings.System.DO_LEFT_BATTERY_TEXT, value ? 1 : 0); + return true; } return false; }