Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No red bars in battery saver mode"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-07 15:35:16 +00:00
committed by Android (Google) Code Review
parent db9b01fbf2 e4c508c3cc
commit b5815fa5d1
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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