Merge "Switch to screenshot when finishing recents animation for split select" into tm-qpr-dev (7fb1336d) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/views/RecentsView.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -2900,6 +2900,19 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T

		InteractionJankMonitorWrapper.begin(this,
		InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER, "First tile selected");
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		if (mSplitHiddenTaskView == getRunningTaskView()) {
		finishRecentsAnimation(true /* toRecents /, false / shouldPip */,
		null /* onFinishComplete */);
		} else {
		switchToScreenshot(
		() -> finishRecentsAnimation(true /* toRecents */,
		false /* shouldPip /, null / onFinishComplete */));
		}
		}
		});
		anim.addEndListener(success -> {
		if (success) {
		InteractionJankMonitorWrapper.end(
		@@ -4190,8 +4203,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		mSplitSelectStateController.setInitialTaskSelect(taskView.getTask(),
		stagePosition, splitEvent, taskView.getItemInfo());
		mSplitHiddenTaskViewIndex = indexOfChild(taskView);
		finishRecentsAnimation(true /* toRecents /, false / shouldPip */,
		null /* onFinishComplete */);
		}

		/**