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

Commit 005a5d27 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bb600247 5bc77a11

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

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

        boolean invisible = onAodNotPulsingOrDocked || mWakeAndUnlockRunning

                || mShowingLaunchAffordance;

                || mShowingLaunchAffordance;

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

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

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

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

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

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

                    && !mWakeUpCoordinator.getNotificationsFullyHidden()) {

                    && !mWakeUpCoordinator.getNotificationsFullyHidden()) {

                invisible = true;

                invisible = true;

            }

            }