From ad4b41ada66abbe9d8d3e1934c1173843e20b6a3 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Thu, 28 Apr 2022 15:31:06 +0000 Subject: [PATCH] [Bouncer] Fix overlap from notif shade Noticed there is in notif shade if we swipe from bottom to show bouncer. This is a regression that was caused in ag/17697952. Fixes: 226108150 Test: Manual on phone device Change-Id: Ic8c1a1ea871f009a592097b77e5a96bbdec9d6ba --- .../notification/stack/NotificationStackScrollLayout.java | 6 +++++- 1 file changed, 5 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 36cd173d2d1cd..3ea5e5b753a3c 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 @@ -70,6 +70,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.graphics.ColorUtils; import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.policy.SystemBarUtils; +import com.android.keyguard.BouncerPanelExpansionCalculator; import com.android.keyguard.KeyguardSliceView; import com.android.settingslib.Utils; import com.android.systemui.Dependency; @@ -1313,7 +1314,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable final float endTopPosition = mTopPadding + mExtraTopInsetForFullShadeTransition + mAmbientState.getOverExpansion() - getCurrentOverScrollAmount(false /* top */); - final float fraction = mAmbientState.getExpansionFraction(); + float fraction = mAmbientState.getExpansionFraction(); + if (mAmbientState.isBouncerInTransit()) { + fraction = BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(fraction); + } final float stackY = MathUtils.lerp(0, endTopPosition, fraction); mAmbientState.setStackY(stackY); if (mOnStackYChanged != null) {