Merge "Null check on target set before rendering task open animation" into sc-dev (578b45f9) · Commits · e / os / BlissLauncher3

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

+17 −7

Original line number	Diff line number	Diff line
		@@ -554,7 +554,13 @@ public class TaskView extends FrameLayout implements Reusable {

		mIsClickableAsLiveTile = false;
		RecentsView recentsView = getRecentsView();
		RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
		final RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
		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.
		launcherNonLiveTileTask();
		return;
		}

		AnimatorSet anim = new AnimatorSet();
		TaskViewUtils.composeRecentsLaunchAnimator(
		@@ -576,6 +582,13 @@ public class TaskView extends FrameLayout implements Reusable {
		});
		anim.start();
		} else {
		launcherNonLiveTileTask();
		}
		mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
		.log(LAUNCHER_TASK_LAUNCH_TAP);
		}

		private void launcherNonLiveTileTask() {
		if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
		// User tapped to select second split screen app
		getRecentsView().confirmSplitSelect(this);
		@@ -583,9 +596,6 @@ public class TaskView extends FrameLayout implements Reusable {
		launchTaskAnimated();
		}
		}
		mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
		.log(LAUNCHER_TASK_LAUNCH_TAP);
		}

		/**
		* Starts the task associated with this view and animates the startup.