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

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

Change-Id: I9f03c6938623e88812350981cec06048d888e9b2
This commit is contained in:
Tony Wickham
2021-10-27 21:42:43 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 1 deletions
@@ -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
@@ -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);
}
}