Merge "[Flexiglass] Ensure that NSSL.intrinsicPadding is always 0 with... (a8bcbffe) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -1598,7 +1598,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;
		@@ -1783,7 +1783,7 @@ public class NotificationStackScrollLayout
		} else {
		appearPosition = mEmptyShadeView.getHeight();
		}
		return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding);
		return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding());
		}

		/**
		@@ -1809,7 +1809,7 @@ public class NotificationStackScrollLayout
		} else {
		appearPosition = mEmptyShadeView.getHeight();
		}
		return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding);
		return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding());
		}

		private boolean isHeadsUpTransition() {
		@@ -2512,9 +2512,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();
		@@ -4558,10 +4558,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;
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1186,6 +1186,7 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		}

		public void setIntrinsicPadding(int intrinsicPadding) {
		SceneContainerFlag.assertInLegacyMode();
		mView.setIntrinsicPadding(intrinsicPadding);
		}