diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/power/PowerUI.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/BatteryService.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index c1a36239662c..a351c09f68b7 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -131,10 +131,15 @@ public class PowerUI extends SystemUI { com.android.internal.R.integer.config_criticalBatteryWarningLevel); final ContentResolver resolver = mContext.getContentResolver(); - int defWarnLevel = mContext.getResources().getInteger( + final int defWarnLevel = mContext.getResources().getInteger( com.android.internal.R.integer.config_lowBatteryWarningLevel); - int warnLevel = Settings.Global.getInt(resolver, + final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver, Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel); + + // NOTE: Keep the logic in sync with BatteryService. + // TODO: Propagate this value from BatteryService to system UI, really. + int warnLevel = Math.min(defWarnLevel, lowPowerModeTriggerLevel); + if (warnLevel == 0) { warnLevel = defWarnLevel; } diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index dcb0fabf0345..af0b66daad50 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -298,6 +298,8 @@ public final class BatteryService extends SystemService { final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver, Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel); + // NOTE: Keep the logic in sync with PowerUI.java in systemUI. + // TODO: Propagate this value from BatteryService to system UI, really. mLowBatteryWarningLevel = Math.min(defWarnLevel, lowPowerModeTriggerLevel); if (mLowBatteryWarningLevel == 0) { |