diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index e49ca13fa25c..b93da4b61f80 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -336,8 +336,13 @@ public class NotificationShelf extends ActivatableNotificationView implements ActivatableNotificationView anv = (ActivatableNotificationView) child; + final boolean isUnlockedHeadsUp = !mAmbientState.isOnKeyguard() + && !mAmbientState.isShadeExpanded() + && child instanceof ExpandableView + && ((ExpandableNotificationRow) child).isHeadsUp(); if (viewStart < shelfStart && !mHostLayoutController.isViewAffectedBySwipe(anv) + && !isUnlockedHeadsUp && !mAmbientState.isPulsing() && !mAmbientState.isDozing()) { |