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

Commit bfa4d451 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Made sure the the lock icon hides again when dragging down" into qt-r1-dev am: 005a5d27 

am: b00757ea

Change-Id: Iee726eabd281af8457c8689d5fc1b992d289c50e
parents 0412ca72 b00757ea

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;

            }