From 3ce69ef4d6103d59c69bef35f8f03a388672ca50 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Tue, 7 Dec 2021 00:43:30 -0500 Subject: [PATCH] Use clipped content translation when dismissing a HUN. This fixes a bug where the HUN being dismissed would disappear into nothing after being swiped aside when in split shade mode. Fixes: 203546452 Test: dismiss notifs from various configurations, including split shade HUN Change-Id: I326e1c766204bdce7b0a97f4de53b70bc192ef6c --- .../notification/stack/NotificationStackScrollLayout.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 5477c19261d11..3496c5667edc3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -3984,6 +3984,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable updateChronometers(); requestChildrenUpdate(); updateUseRoundedRectClipping(); + updateDismissBehavior(); } } @@ -4925,6 +4926,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable StringBuilder sb = new StringBuilder("[") .append(this.getClass().getSimpleName()).append(":") .append(" pulsing=").append(mPulsing ? "T" : "f") + .append(" expanded=").append(mIsExpanded ? "T" : "f") + .append(" headsUpPinned=").append(mInHeadsUpPinnedMode ? "T" : "f") + .append(" qsClipping=").append(mShouldUseRoundedRectClipping ? "T" : "f") + .append(" qsClipDismiss=").append(mDismissUsingRowTranslationX ? "T" : "f") .append(" visibility=").append(DumpUtilsKt.visibilityString(getVisibility())) .append(" alpha=").append(getAlpha()) .append(" scrollY=").append(mAmbientState.getScrollY()) @@ -5452,7 +5457,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable // On the split keyguard, dismissing with clipping without a visual boundary looks odd, // so let's use the content dismiss behavior instead. boolean dismissUsingRowTranslationX = !mShouldUseSplitNotificationShade - || mStatusBarState != StatusBarState.KEYGUARD; + || (mStatusBarState != StatusBarState.KEYGUARD && mIsExpanded); if (mDismissUsingRowTranslationX != dismissUsingRowTranslationX) { mDismissUsingRowTranslationX = dismissUsingRowTranslationX; for (int i = 0; i < getChildCount(); i++) {