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

Commit aabead2d authored Dec 22, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Dec 22, 2021

Merge "Fix testStressSwipeToOverview" into sc-dev

parents 1a453f15 f540e5ca

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -428,6 +428,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
	mAnimationFactory = mActivityInterface.prepareRecentsUI(mDeviceState,		mAnimationFactory = mActivityInterface.prepareRecentsUI(mDeviceState,
	mWasLauncherAlreadyVisible, this::onAnimatorPlaybackControllerCreated);		mWasLauncherAlreadyVisible, this::onAnimatorPlaybackControllerCreated);
	maybeUpdateRecentsAttachedState(false /* animate */);		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) {		if (mWasLauncherAlreadyVisible) {
	// Launcher is visible, but might be about to stop. Thus, if we prepare recents		// 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	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
	protected void onLauncherActivityClose(Launcher launcher) {		protected void onLauncherActivityClose(Launcher launcher) {
	RecentsView recentsView = launcher.getOverviewPanel();		RecentsView recentsView = launcher.getOverviewPanel();
	if (recentsView != null) {		if (recentsView != null) {
	recentsView.finishRecentsAnimation(true, null);		recentsView.finishRecentsAnimation(false /* toRecents */, null);
	}		}
	}		}