Merge "Debugging Logs for TaplTestsTransientTaskbar#testSwipeToStashAndUnstash" into main (a53f3ceb) · Commits · e / os / android_packages_apps_Trebuchet

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -861,7 +861,8 @@ public class TaskView extends FrameLayout implements Reusable {
		@Nullable
		public RunnableList launchTaskAnimated() {
		if (mTask != null) {
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "TaskView.launchTaskAnimated");
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,
		"TaskView.launchTaskAnimated: startActivityFromRecentsAsync");
		TestLogging.recordEvent(
		TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
		ActivityOptionsWrapper opts = mActivity.getActivityLaunchOptions(this, null);
		@@ -910,7 +911,8 @@ public class TaskView extends FrameLayout implements Reusable {
		*/
		public void launchTask(@NonNull Consumer<Boolean> callback, boolean isQuickswitch) {
		if (mTask != null) {
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "TaskView.launchTaskAnimated");
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,
		"TaskView.launchTask: startActivityFromRecentsAsync");
		TestLogging.recordEvent(
		TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);

		@@ -1004,6 +1006,8 @@ 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.
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,
		"TaskView.java - launchTasks: recents animation is cancelled");
		RunnableList runnableList = launchTaskAnimated();
		if (runnableList == null) {
		Log.e(TAG, "Recents animation cancelled and cannot launch task as non-live tile"
		@@ -1024,6 +1028,8 @@ public class TaskView extends FrameLayout implements Reusable {
		@Override
		public void onAnimationEnd(Animator animator) {
		if (mTask != null && mTask.key.displayId != getRootViewDisplayId()) {
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,
		"TaskView.java - launchTasks: onAnimationEnd");
		launchTaskAnimated();
		}
		mIsClickableAsLiveTile = true;
		@@ -1043,6 +1049,9 @@ public class TaskView extends FrameLayout implements Reusable {
		recentsView.onTaskLaunchedInLiveTileMode();
		return runnableList;
		} else {
		testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,
		"TaskView.java - launchTasks: isRunningTask=" + isRunningTask() + "\|\|"
		+ "remoteTargetHandles == null?" + (remoteTargetHandles == null));
		return launchTaskAnimated();
		}
		}