commit 6fda802363c8380f1d743e63ddecbc95e5f813d7
author Lyn Han <lynhan@google.com> Wed May 26 21:33:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 26 21:33:15 2021 +0000
tree 1b8c1b444cc269ecc516f24015ae99b47b2259f1
parent f010ed6344df0f76e01675b354e0e475037f4560
parent 1988f9e0d32abe5d5aa179e52de53a24f3f20cf2

Merge "Fix hun-to-shade corner clipping" into sc-dev

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index 889dfde..9dc4ac9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -358,9 +358,13 @@
                 && anv instanceof ExpandableNotificationRow
                 && ((ExpandableNotificationRow) anv).isHeadsUp();
 
+        final boolean isHunGoingToShade = mAmbientState.isShadeExpanded()
+                && anv == mAmbientState.getTrackedHeadsUpRow();
+
         final boolean shouldUpdateCornerRoundness = viewStart < shelfStart
                 && !mHostLayoutController.isViewAffectedBySwipe(anv)
                 && !isUnlockedHeadsUp
+                && !isHunGoingToShade
                 && !mAmbientState.isPulsing()
                 && !mAmbientState.isDozing();