Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e67ad3eb authored by Lyn's avatar Lyn Committed by Lyn Han
Browse files

Fix flying notification on lockscreen after fold 

Fixes: 301419977
Test: fold device on lockscreen => no fly
      unfold device on lockscreen => no regression
      swipe away UMO in expanded shade => no regression
      turn on flashlight from lockscreen, change smartspace height
      => no regression

Flag: none
Change-Id: I623d1bb6c6e966ddafef859567d4eecae4e70aa5
parent 9be62325

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

+7 −1
Original line number Diff line number Diff line
@@ -568,6 +568,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;
@@ -1348,7 +1349,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;

            }
@@ -5702,6 +5707,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();