commit de159c8d16d94785476000e209daa7b5bd6ab5fa
author Dianne Hackborn <hackbod@google.com> Tue Jun 10 23:17:01 2014 -0700
committer Dianne Hackborn <hackbod@google.com> Tue Jun 10 23:17:01 2014 -0700
tree 9e5e2d7fbad5bb32cfe71646e756421fd8b59bb1
parent e9ee5e2cede8d7e8fd7791113903df7eff1ec75a

Small fixes to power save UI.

Use the correct default setting, and don't crash.

Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4

src/com/android/settings/fuelgauge/BatterySaverSettings.java

diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 1a7e892..b62ddb7 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -59,7 +59,9 @@
         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 @@
         mSettingsObserver.setListening(false);
         if (mSwitchBarListenerAdded) {
             mSwitchBar.removeOnSwitchChangeListener(this);
+            mSwitchBarListenerAdded = false;
         }
         mSwitchBar.hide();
     }