Merge "Try to handle side-task launches even if not fully transitioned to overview" into udc-dev (a5fb95df) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2260,6 +2260,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		targetCompat.taskId == mGestureState.getLastStartedTaskId())
		.findFirst();
		if (!taskTargetOptional.isPresent()) {
		ActiveGestureLog.INSTANCE.addLog("No appeared task matching started task id");
		finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */);
		return;
		}
		@@ -2267,6 +2268,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		TaskView taskView = mRecentsView == null
		? null : mRecentsView.getTaskViewByTaskId(taskTarget.taskId);
		if (taskView == null \|\| !taskView.getThumbnail().shouldShowSplashView()) {
		ActiveGestureLog.INSTANCE.addLog("Invalid task view splash state");
		finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */);
		return;
		}

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
		import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;
		import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;
		import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;
		@@ -174,16 +175,21 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
		if (nonAppTargets == null) {
		nonAppTargets = new RemoteAnimationTarget[0];
		}
		if (activityInterface.isInLiveTileMode()
		if ((activityInterface.isInLiveTileMode()
		\|\| mLastGestureState.getEndTarget() == RECENTS)
		&& activityInterface.getCreatedActivity() != null) {
		RecentsView recentsView =
		activityInterface.getCreatedActivity().getOverviewPanel();
		if (recentsView != null) {
		ActiveGestureLog.INSTANCE.addLog("Launching side task id="
		+ appearedTaskTarget.taskId);
		recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId,
		appearedTaskTargets,
		new RemoteAnimationTarget[0] /* wallpaper */,
		nonAppTargets /* nonApps */);
		return;
		} else {
		ActiveGestureLog.INSTANCE.addLog("Unable to launch side task (no recents)");
		}
		} else if (nonAppTargets.length > 0) {
		TaskViewUtils.createSplitAuxiliarySurfacesAnimator(nonAppTargets /* nonApps */,