Merge "[Flexiglass] Ensure that NSSL.intrinsicPadding is always 0 with SceneContainer enabled" into main
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 8f187f0..07b0b83 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
@@ -1598,7 +1598,7 @@
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;
@@ -1783,7 +1783,7 @@
} else {
appearPosition = mEmptyShadeView.getHeight();
}
- return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding);
+ return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding());
}
/**
@@ -1809,7 +1809,7 @@
} else {
appearPosition = mEmptyShadeView.getHeight();
}
- return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding);
+ return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding());
}
private boolean isHeadsUpTransition() {
@@ -2512,9 +2512,9 @@
// 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();
@@ -4558,10 +4558,20 @@
}
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 693e8ff..f35d666 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 void setIntrinsicPadding(int intrinsicPadding) {
+ SceneContainerFlag.assertInLegacyMode();
mView.setIntrinsicPadding(intrinsicPadding);
}