diff options
2 files changed, 15 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java index 2f3719a34ac8..1431b28bf794 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java @@ -533,8 +533,15 @@ public class AmbientState implements Dumpable { if (mDozeAmount == 1.0f && !isPulseExpanding()) { return mShelf.getHeight(); } - int height = (int) Math.max(mLayoutMinHeight, - Math.min(mLayoutHeight, mContentHeight) - mTopPadding); + int height; + if (SceneContainerFlag.isEnabled()) { + // TODO(b/192348384): This is probably incorrect as mContentHeight is not up to date. + // Consider removing usages of getInnerHeight in flexiglass if possible. + height = (int) Math.min(mLayoutHeight, mContentHeight) - mTopPadding; + } else { + height = (int) Math.max(mLayoutMinHeight, + Math.min(mLayoutHeight, mContentHeight) - mTopPadding); + } if (ignorePulseHeight) { return height; } @@ -571,6 +578,7 @@ public class AmbientState implements Dumpable { } public void setLayoutMinHeight(int layoutMinHeight) { + SceneContainerFlag.assertInLegacyMode(); mLayoutMinHeight = layoutMinHeight; } 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 925ebf30cf7b..cea7561819a2 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 @@ -1308,8 +1308,10 @@ public class NotificationStackScrollLayout } private void updateAlgorithmLayoutMinHeight() { - mAmbientState.setLayoutMinHeight(mQsFullScreen || isHeadsUpTransition() - ? getLayoutMinHeightInternal() : 0); + if (!SceneContainerFlag.isEnabled()) { + mAmbientState.setLayoutMinHeight(mQsFullScreen || isHeadsUpTransition() + ? getLayoutMinHeightInternal() : 0); + } } /** @@ -2795,6 +2797,7 @@ public class NotificationStackScrollLayout } private int getLayoutMinHeightInternal() { + SceneContainerFlag.assertInLegacyMode(); if (isHeadsUpTransition()) { ExpandableNotificationRow trackedHeadsUpRow = mAmbientState.getTrackedHeadsUpRow(); if (trackedHeadsUpRow.isAboveShelf()) { |