BatteryMeterDrawable: add text style (2/2)

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Danesh M
2015-10-28 14:07:03 -07:00
committed by Hưng Phan
parent 580e5cf28a
commit b0292b2445
3 changed files with 15 additions and 0 deletions

View File

@@ -398,9 +398,11 @@
<string-array name="entries_status_bar_battery" translatable="false"> <string-array name="entries_status_bar_battery" translatable="false">
<item>@string/status_bar_battery_style_port</item> <item>@string/status_bar_battery_style_port</item>
<item>@string/status_bar_battery_style_circle</item> <item>@string/status_bar_battery_style_circle</item>
<item>@string/status_bar_battery_style_text</item>
</string-array> </string-array>
<string-array name="values_status_bar_battery" translatable="false"> <string-array name="values_status_bar_battery" translatable="false">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
<item>2</item>
</string-array> </string-array>
</resources> </resources>

View File

@@ -496,5 +496,6 @@
<string name="status_bar_battery_style_title">Battery style</string> <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_port">Portrait</string>
<string name="status_bar_battery_style_circle">Circle</string> <string name="status_bar_battery_style_circle">Circle</string>
<string name="status_bar_battery_style_text">Text</string>
</resources> </resources>

View File

@@ -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 SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style"; 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 mStatusBarBatteryShowPercent;
private ListPreference mStatusBarBattery; private ListPreference mStatusBarBattery;
@@ -59,6 +61,7 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
Settings.Secure.STATUS_BAR_BATTERY_STYLE, 0); Settings.Secure.STATUS_BAR_BATTERY_STYLE, 0);
mStatusBarBattery.setValue(String.valueOf(batteryStyle)); mStatusBarBattery.setValue(String.valueOf(batteryStyle));
mStatusBarBattery.setSummary(mStatusBarBattery.getEntry()); mStatusBarBattery.setSummary(mStatusBarBattery.getEntry());
enableStatusBarBatteryDependents(batteryStyle);
mStatusBarBattery.setOnPreferenceChangeListener(this); mStatusBarBattery.setOnPreferenceChangeListener(this);
} }
@@ -84,8 +87,17 @@ public class StatusBarBattery extends SettingsPreferenceFragment implements
Settings.Secure.putInt(resolver, Settings.Secure.putInt(resolver,
Settings.Secure.STATUS_BAR_BATTERY_STYLE, batteryStyle); Settings.Secure.STATUS_BAR_BATTERY_STYLE, batteryStyle);
mStatusBarBattery.setSummary(mStatusBarBattery.getEntries()[index]); mStatusBarBattery.setSummary(mStatusBarBattery.getEntries()[index]);
enableStatusBarBatteryDependents(batteryStyle);
return true; return true;
} }
return false; return false;
} }
private void enableStatusBarBatteryDependents(int batteryIconStyle) {
if (batteryIconStyle == STATUS_BAR_BATTERY_STYLE_TEXT) {
mStatusBarBatteryShowPercent.setEnabled(false);
} else {
mStatusBarBatteryShowPercent.setEnabled(true);
}
}
} }