commit 28dd62af0afc932772ffd3a497346379ea5fa847
author Lyn Han <lynhan@google.com> Wed Feb 16 14:23:42 2022 -0600
committer Lyn Han <lynhan@google.com> Wed Feb 16 14:42:15 2022 -0600
tree 646aa532d63909357d293ce06c1197cc941d2389
parent 26b0f4c1363c919fd533932aa92ddbcb1c8c4994

Fix overlapping HUNs

Fixes: 200544499
Test: send tall HUN, then short HUN => no clipping

Change-Id: I0fc643bfc50b2b3617bf3eb163bfe61c75544de4

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
index 3a3f581..952cd9a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
@@ -202,10 +202,12 @@
             float newHeight = state.height;
             float newNotificationEnd = newYTranslation + newHeight;
             boolean isHeadsUp = (child instanceof ExpandableNotificationRow) && child.isPinned();
+            final boolean shadeClosedWithHUN =
+                    ambientState.isShadeOpening() && !ambientState.isShadeExpanded();
             if (mClipNotificationScrollToTop
                     && (!state.inShelf || (isHeadsUp && !firstHeadsUp))
                     && newYTranslation < clipStart
-                    && !ambientState.isShadeOpening()) {
+                    && shadeClosedWithHUN) {
                 // The previous view is overlapping on top, clip!
                 float overlapAmount = clipStart - newYTranslation;
                 state.clipTopAmount = (int) overlapAmount;