summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/fuelgauge
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-06-10 23:17:01 -0700
committerDianne Hackborn <hackbod@google.com>2014-06-10 23:17:01 -0700
commitde159c8d16d94785476000e209daa7b5bd6ab5fa (patch)
tree9e5e2d7fbad5bb32cfe71646e756421fd8b59bb1 /src/com/android/settings/fuelgauge
parente9ee5e2cede8d7e8fd7791113903df7eff1ec75a (diff)
downloadpackages_apps_Settings-de159c8d16d94785476000e209daa7b5bd6ab5fa.tar.gz
packages_apps_Settings-de159c8d16d94785476000e209daa7b5bd6ab5fa.tar.bz2
packages_apps_Settings-de159c8d16d94785476000e209daa7b5bd6ab5fa.zip
Small fixes to power save UI.
Use the correct default setting, and don't crash. Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4
Diffstat (limited to 'src/com/android/settings/fuelgauge')
-rw-r--r--src/com/android/settings/fuelgauge/BatterySaverSettings.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 1a7e892c2..b62ddb7d7 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -59,7 +59,9 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
mSwitchBar = ((SettingsActivity) mContext).getSwitchBar();
updateSwitchBar();
mTriggerPref = new SettingPref(SettingPref.TYPE_GLOBAL, KEY_TURN_ON_AUTOMATICALLY,
- Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0,
+ Global.LOW_POWER_MODE_TRIGGER_LEVEL,
+ mContext.getResources().getInteger(
+ com.android.internal.R.integer.config_lowBatteryWarningLevel),
getResources().getIntArray(R.array.battery_saver_trigger_values)) {
@Override
protected String getCaption(Resources res, int value) {
@@ -103,6 +105,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
mSettingsObserver.setListening(false);
if (mSwitchBarListenerAdded) {
mSwitchBar.removeOnSwitchChangeListener(this);
+ mSwitchBarListenerAdded = false;
}
mSwitchBar.hide();
}