From 1988f9e0d32abe5d5aa179e52de53a24f3f20cf2 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Wed, 26 May 2021 12:39:03 -0500
Subject: [PATCH] Fix hun-to-shade corner clipping

Bug: 189145086
Test: swipe down from hun to transition to shade => no weird clipping

Change-Id: I4ee72b63b1dd167d462b3f91db8c3788b7f4d528
---
 .../src/com/android/systemui/statusbar/NotificationShelf.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index 889dfde3a66d7..9dc4ac952b1d1 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 @@ public class NotificationShelf extends ActivatableNotificationView implements
                 && 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();