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
This commit is contained in:
Jeff DeCew
2021-12-07 00:43:30 -05:00
parent c262621e01
commit 3ce69ef4d6

View File

@@ -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++) {