Merge "Return to home when overview command fails." into tm-qpr-dev (62b9f80d) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ public class OverviewCommandHelper {
		*/
		@BinderThread
		public void addCommand(int type) {
		if (mPendingCommands.size() > MAX_QUEUE_SIZE) {
		if (mPendingCommands.size() >= MAX_QUEUE_SIZE) {
		return;
		}
		CommandInfo cmd = new CommandInfo(type);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ public class DesktopTaskView extends TaskView {
		public RunnableList launchTasks() {
		SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
		getRecentsView().startHome();
		return new RunnableList();
		return null;
		}

		@Nullable

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -726,13 +726,14 @@ public class TaskView extends FrameLayout implements Reusable {
		/**
		* Launch of the current task (both live and inactive tasks) with an animation.
		*/
		@Nullable
		public RunnableList launchTasks() {
		RecentsView recentsView = getRecentsView();
		RemoteTargetHandle[] remoteTargetHandles = recentsView.mRemoteTargetHandles;
		RunnableList runnableList = new RunnableList();
		if (isRunningTask() && remoteTargetHandles != null) {
		if (!mIsClickableAsLiveTile) {
		return runnableList;
		Log.e(TAG, "TaskView is not clickable as a live tile; returning to home.");
		return null;
		}

		mIsClickableAsLiveTile = false;
		@@ -757,11 +758,16 @@ public class TaskView extends FrameLayout implements Reusable {
		if (targets == null) {
		// If the recents animation is cancelled somehow between the parent if block and
		// here, try to launch the task as a non live tile task.
		launchTaskAnimated();
		RunnableList runnableList = launchTaskAnimated();
		if (runnableList == null) {
		Log.e(TAG, "Recents animation cancelled and cannot launch task as non-live tile"
		+ "; returning to home");
		}
		mIsClickableAsLiveTile = true;
		return runnableList;
		}

		RunnableList runnableList = new RunnableList();
		AnimatorSet anim = new AnimatorSet();
		TaskViewUtils.composeRecentsLaunchAnimator(
		anim, this, targets.apps,
		@@ -798,10 +804,10 @@ public class TaskView extends FrameLayout implements Reusable {
		});
		anim.start();
		recentsView.onTaskLaunchedInLiveTileMode();
		return runnableList;
		} else {
		return launchTaskAnimated();
		}
		return runnableList;
		}

		/**