Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev

am: 5cfe787dec

Change-Id: I909b5989fa79f11e20bb7760bed003077344870e
This commit is contained in:
Evan Laird
2018-05-22 11:48:26 -07:00
committed by android-build-merger

View File

@@ -2090,7 +2090,8 @@ public class StatusBar extends SystemUI implements DemoMode,
* @param animate should the change of the icons be animated.
*/
private void updateHideIconsForBouncer(boolean animate) {
boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded && mStatusBarWindowHidden;
boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded
&& (mStatusBarWindowHidden || mBouncerShowing);
boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing;
boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard;
if (mHideIconsForBouncer != shouldHideIconsForBouncer) {