diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java | 11 |
1 files changed, 7 insertions, 4 deletions
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 f464ef1df301..a21059defaca 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 @@ -1439,6 +1439,11 @@ public class NotificationStackScrollLayout * @param listenerNeedsAnimation does the listener need to animate? */ private void updateStackPosition(boolean listenerNeedsAnimation) { + // When scene container is active, we only want to recalculate stack heights. + if (SceneContainerFlag.isEnabled()) { + updateStackEndHeightAndStackHeight(mAmbientState.getExpansionFraction()); + return; + } float topOverscrollAmount = mShouldUseSplitNotificationShade ? getCurrentOverScrollAmount(true /* top */) : 0f; final float endTopPosition = getTopPadding() + mExtraTopInsetForFullShadeTransition @@ -1451,10 +1456,8 @@ public class NotificationStackScrollLayout if (mAmbientState.isBouncerInTransit() && mQsExpansionFraction > 0f) { fraction = BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(fraction); } - if (!SceneContainerFlag.isEnabled()) { - final float stackY = MathUtils.lerp(0, endTopPosition, fraction); - mAmbientState.setStackY(stackY); - } + final float stackY = MathUtils.lerp(0, endTopPosition, fraction); + mAmbientState.setStackY(stackY); if (mOnStackYChanged != null) { mOnStackYChanged.accept(listenerNeedsAnimation); |