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

Commit 4075363e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Made sure the the lock icon hides again when dragging down" into... 

Merge "Merge "Made sure the the lock icon hides again when dragging down" into qt-r1-dev am: 005a5d27 am: b00757ea" into qt-qpr1-dev-plus-aosp
parents 33d1e7e8 73291b37

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

+2 −2
Original line number Diff line number Diff line
@@ -338,8 +338,8 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
        boolean invisible = onAodNotPulsingOrDocked || mWakeAndUnlockRunning

                || mShowingLaunchAffordance;

        if (mBypassController.getBypassEnabled() && !mBouncerShowingScrimmed) {

            if ((mHeadsUpManager.isHeadsUpGoingAway() || mHeadsUpManager.hasPinnedHeadsUp())

                    && mStatusBarStateController.getState() == StatusBarState.KEYGUARD

            if ((mHeadsUpManager.isHeadsUpGoingAway() || mHeadsUpManager.hasPinnedHeadsUp()

                    || mStatusBarStateController.getState() == StatusBarState.KEYGUARD)

                    && !mWakeUpCoordinator.getNotificationsFullyHidden()) {

                invisible = true;

            }