diff options
2 files changed, 16 insertions, 5 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 0e4be8ecc920..cf2c7c963138 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 @@ -1591,7 +1591,7 @@ public class NotificationStackScrollLayout if (mShouldShowShelfOnly) { stackHeight = getTopPadding() + mShelf.getIntrinsicHeight(); } else if (mQsFullScreen) { - int stackStartPosition = mContentHeight - getTopPadding() + mIntrinsicPadding; + int stackStartPosition = mContentHeight - getTopPadding() + getIntrinsicPadding(); int stackEndPosition = mMaxTopPadding + mShelf.getIntrinsicHeight(); if (stackStartPosition <= stackEndPosition) { stackHeight = stackEndPosition; @@ -1776,7 +1776,7 @@ public class NotificationStackScrollLayout } else { appearPosition = mEmptyShadeView.getHeight(); } - return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding); + return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding()); } /** @@ -1802,7 +1802,7 @@ public class NotificationStackScrollLayout } else { appearPosition = mEmptyShadeView.getHeight(); } - return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding); + return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding()); } private boolean isHeadsUpTransition() { @@ -2505,9 +2505,9 @@ public class NotificationStackScrollLayout // The topPadding can be bigger than the regular padding when qs is expanded, in that // state the maxPanelHeight and the contentHeight should be bigger mContentHeight = - (int) (height + Math.max(mIntrinsicPadding, getTopPadding()) + mBottomPadding); + (int) (height + Math.max(getIntrinsicPadding(), getTopPadding()) + mBottomPadding); mScrollViewFields.setIntrinsicStackHeight( - (int) (mIntrinsicPadding + mIntrinsicContentHeight + footerIntrinsicHeight + (int) (getIntrinsicPadding() + mIntrinsicContentHeight + footerIntrinsicHeight + mBottomPadding)); updateScrollability(); clampScrollPosition(); @@ -4551,10 +4551,20 @@ public class NotificationStackScrollLayout } void setIntrinsicPadding(int intrinsicPadding) { + SceneContainerFlag.assertInLegacyMode(); mIntrinsicPadding = intrinsicPadding; } + /** + * Distance from the top of the screen in, where notifications should start when fully expanded + * or in the LS. + * + * Always 0 with SceneContainer enabled. + */ int getIntrinsicPadding() { + if (SceneContainerFlag.isEnabled()) { + return 0; + } return mIntrinsicPadding; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 693e8ffa92ec..f35d6660edd9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -1186,6 +1186,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { } public void setIntrinsicPadding(int intrinsicPadding) { + SceneContainerFlag.assertInLegacyMode(); mView.setIntrinsicPadding(intrinsicPadding); } |