Merge "Fix flying notification on lockscreen after fold" into main (861e1394) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -565,6 +565,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		private NotificationStackScrollLayoutController.TouchHandler mTouchHandler;
		private final ScreenOffAnimationController mScreenOffAnimationController;
		private boolean mShouldUseSplitNotificationShade;
		private boolean mShouldSkipTopPaddingAnimationAfterFold = false;
		private boolean mHasFilteredOutSeenNotifications;
		@Nullable private SplitShadeStateController mSplitShadeStateController = null;
		private boolean mIsSmallLandscapeLockscreenEnabled = false;
		@@ -1364,7 +1365,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		mTopPadding = topPadding;
		updateAlgorithmHeightAndPadding();
		updateContentHeight();
		if (shouldAnimate && mAnimationsEnabled && mIsExpanded) {
		if (mAmbientState.isOnKeyguard()
		&& !mShouldUseSplitNotificationShade
		&& mShouldSkipTopPaddingAnimationAfterFold) {
		mShouldSkipTopPaddingAnimationAfterFold = false;
		} else if (shouldAnimate && mAnimationsEnabled && mIsExpanded) {
		mTopPaddingNeedsAnimation = true;
		mNeedsAnimation = true;
		}
		@@ -5741,6 +5746,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		boolean split = mSplitShadeStateController.shouldUseSplitNotificationShade(getResources());
		if (split != mShouldUseSplitNotificationShade) {
		mShouldUseSplitNotificationShade = split;
		mShouldSkipTopPaddingAnimationAfterFold = true;
		mAmbientState.setUseSplitShade(split);
		updateDismissBehavior();
		updateUseRoundedRectClipping();