Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev

2021-07-08 23:13:23 +00:00
parent ec1a26e36c c4316e2f70
commit a2c2bfdefd
1 changed files with 1 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -367,6 +367,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
                && !mHostLayoutController.isViewAffectedBySwipe(anv)
                && !isUnlockedHeadsUp
                && !isHunGoingToShade
+                && !anv.isAboveShelf()
                && !mAmbientState.isPulsing()
                && !mAmbientState.isDozing();