From e4c508c3cced603ed68fb71a975b1f778ce4bbc1 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Mon, 6 Nov 2017 13:01:29 -0800 Subject: [PATCH] No red bars in battery saver mode We no longer want to show the red bars in the battery saver mode. Test: manual test Bug: 68769804 Bug: 63527520 Change-Id: Ib8a86fda025705a552f39742765b03a43329c11f --- .../systemui/statusbar/phone/LightBarController.java | 3 +-- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java index d226fedef7064..1c361caa4a1aa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java @@ -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() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 4a58c6d6b3ff1..55308928f9e78 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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); }