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

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

Merge "No red bars in battery saver mode"

parents db9b01fb e4c508c3

packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java

+1 −2
Original line number Diff line number Diff line
@@ -175,9 +175,8 @@ public class LightBarController implements BatteryController.BatteryStateChangeC 
    private boolean isLight(int vis, int barMode, int flag) {

        boolean isTransparentBar = (barMode == MODE_TRANSPARENT

                || barMode == MODE_LIGHTS_OUT_TRANSPARENT);

        boolean allowLight = isTransparentBar && !mBatteryController.isPowerSave();

        boolean light = (vis & flag) != 0;

        return allowLight && light;

        return isTransparentBar && light;

    }



    private boolean animateChange() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −5
Original line number Diff line number Diff line
@@ -3278,12 +3278,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }



    void checkBarMode(int mode, int windowState, BarTransitions transitions) {

        final boolean powerSave = mBatteryController.isPowerSave();

        final boolean anim = !mNoAnimationOnNextBarModeChange && mDeviceInteractive

                && windowState != WINDOW_STATE_HIDDEN && !powerSave;

        if (powerSave && getBarState() == StatusBarState.SHADE) {

            mode = MODE_WARNING;

        }

                && windowState != WINDOW_STATE_HIDDEN;

        transitions.transitionTo(mode, anim);

    }