psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forward Port Battery Styles

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Sven Dawitz
2013-11-17 23:14:23 -05:00
committed by Hưng Phan
parent 2ff574b8c7
commit 3a3df7da3b
5 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/cherish_arrays.xml
View File

@@ -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>

5
res/values/cherish_strings.xml
View File

@@ -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>

7
res/xml/cherish_settings_statusbar.xml
View File

@@ -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"

8
res/xml/statusbar_battery.xml
View File

@@ -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>

16
src/com/cherish/settings/fragments/StatusBarBattery.java
View File

@@ -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;
}