Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c90ab5c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Keep PowerUI low-battery logic in sync with BatteryService."

parents eb171a35 4a9036bf

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -131,10 +131,15 @@ public class PowerUI extends SystemUI { 
                com.android.internal.R.integer.config_criticalBatteryWarningLevel);

                com.android.internal.R.integer.config_criticalBatteryWarningLevel);





        final ContentResolver resolver = mContext.getContentResolver();

        final ContentResolver resolver = mContext.getContentResolver();

        int defWarnLevel = mContext.getResources().getInteger(

        final int defWarnLevel = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_lowBatteryWarningLevel);

                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);

                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) {

        if (warnLevel == 0) {

            warnLevel = defWarnLevel;

            warnLevel = defWarnLevel;

        }

        }

services/core/java/com/android/server/BatteryService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,8 @@ public final class BatteryService extends SystemService { 
        final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver,

        final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver,

                Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);

                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);

        mLowBatteryWarningLevel = Math.min(defWarnLevel, lowPowerModeTriggerLevel);





        if (mLowBatteryWarningLevel == 0) {

        if (mLowBatteryWarningLevel == 0) {