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

Commit 7c526756 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

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

am: 5cfe787d

Change-Id: I909b5989fa79f11e20bb7760bed003077344870e
parents f5b7a6ae 5cfe787d

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -2090,7 +2090,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * @param animate should the change of the icons be animated.

     * @param animate should the change of the icons be animated.

     */

     */

    private void updateHideIconsForBouncer(boolean animate) {

    private void updateHideIconsForBouncer(boolean animate) {

        boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded && mStatusBarWindowHidden;

        boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded

                && (mStatusBarWindowHidden || mBouncerShowing);

        boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing;

        boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing;

        boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard;

        boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard;

        if (mHideIconsForBouncer != shouldHideIconsForBouncer) {

        if (mHideIconsForBouncer != shouldHideIconsForBouncer) {