diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java | 20 |
1 files changed, 13 insertions, 7 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 1eac4171bdc5..f5c10904b6c0 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 @@ -1694,7 +1694,7 @@ public class NotificationStackScrollLayout } else if (mQsFullScreen) { int stackStartPosition = getContentHeight() - getTopPadding() + getIntrinsicPadding(); - int stackEndPosition = mMaxTopPadding + mShelf.getIntrinsicHeight(); + int stackEndPosition = getMaxTopPadding() + mShelf.getIntrinsicHeight(); if (stackStartPosition <= stackEndPosition) { stackHeight = stackEndPosition; } else { @@ -2851,11 +2851,6 @@ public class NotificationStackScrollLayout setExpandedHeight(mExpandedHeight); } - public void setMaxTopPadding(int maxTopPadding) { - SceneContainerFlag.assertInLegacyMode(); - mMaxTopPadding = maxTopPadding; - } - public int getLayoutMinHeight() { SceneContainerFlag.assertInLegacyMode(); return getLayoutMinHeightInternal(); @@ -5514,7 +5509,6 @@ public class NotificationStackScrollLayout println(pw, "alpha", getAlpha()); println(pw, "suppressChildrenMeasureLayout", mSuppressChildrenMeasureAndLayout); println(pw, "scrollY", mAmbientState.getScrollY()); - println(pw, "maxTopPadding", mMaxTopPadding); println(pw, "showShelfOnly", mShouldShowShelfOnly); println(pw, "qsExpandFraction", mQsExpansionFraction); println(pw, "isCurrentUserSetup", mIsCurrentUserSetup); @@ -5551,6 +5545,7 @@ public class NotificationStackScrollLayout println(pw, "intrinsicContentHeight", getIntrinsicContentHeight()); println(pw, "contentHeight", getContentHeight()); println(pw, "topPadding", getTopPadding()); + println(pw, "maxTopPadding", getMaxTopPadding()); } }); pw.println(); @@ -6979,4 +6974,15 @@ public class NotificationStackScrollLayout SceneContainerFlag.assertInLegacyMode(); mIntrinsicContentHeight = intrinsicContentHeight; } + + private int getMaxTopPadding() { + SceneContainerFlag.assertInLegacyMode(); + return mMaxTopPadding; + } + + /** Not used with SceneContainerFlag, because we rely on the placeholder for placement. */ + public void setMaxTopPadding(int maxTopPadding) { + SceneContainerFlag.assertInLegacyMode(); + mMaxTopPadding = maxTopPadding; + } } |