From db9af8f2b50bd06f7f9a53e3a90f6334ad3047d6 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Tue, 18 May 2021 15:55:35 -0500
Subject: [PATCH] Fix heads up notification corner roundness

Fixes: 188455706
Test: add many huns, corners look correct

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index e49ca13fa25c8..b93da4b61f804 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()) {