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

Commit 46575af5 authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Fix testStressSwipeToOverview" into sc-v2-dev am: c1cdadf6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16132969

Change-Id: I9f03c6938623e88812350981cec06048d888e9b2
parents 494de979 c1cdadf6

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+4 −0
Original line number Diff line number Diff line
@@ -444,6 +444,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                mAnimationFactory = mActivityInterface.prepareRecentsUI(mDeviceState,

                        mWasLauncherAlreadyVisible, this::onAnimatorPlaybackControllerCreated);

                maybeUpdateRecentsAttachedState(false /* animate */);

                if (mGestureState.getEndTarget() != null) {

                    // Update the end target in case the gesture ended before we init.

                    mAnimationFactory.setEndTarget(mGestureState.getEndTarget());

                }

            };

            if (mWasLauncherAlreadyVisible) {

                // Launcher is visible, but might be about to stop. Thus, if we prepare recents

quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest { 
    protected void onLauncherActivityClose(Launcher launcher) {

        RecentsView recentsView = launcher.getOverviewPanel();

        if (recentsView != null) {

            recentsView.finishRecentsAnimation(true, null);

            recentsView.finishRecentsAnimation(false /* toRecents */, null);

        }

    }