From 5bc77a116802e7fe2843aeec712f4f1037d4edeb Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 26 Jul 2019 22:25:49 -0700 Subject: Made sure the the lock icon hides again when dragging down Previously we were requiring a heads up to be present but that's not necessary and would lead to issues when dragging down Fixes: 138469678 Test: get notification / drag down, observe normal lock icon Change-Id: I1bfa7c1f9fb6b0bb0a76eb1ed15f25be6da2fab3 --- .../SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index c9c80d464b46..06a2225ed0bf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -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; } -- cgit v1.2.3-59-g8ed1b