Merge "Fix heads up notification corner roundness" into sc-dev

2021-05-20 04:24:49 +00:00
parent 95188f3762 db9af8f2b5
commit e74cc3561e
1 changed files with 5 additions and 0 deletions
--- 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()) {