Merge "Improve taskId logging for Overview" into main (e14ee6f9) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/util/DesktopTask.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -56,4 +56,10 @@ public class DesktopTask extends GroupTask {
		public DesktopTask copy() {
		return new DesktopTask(tasks);
		}

		@Override
		public String toString() {
		return "type=" + taskViewType + " tasks=" + tasks;
		}

		}

quickstep/src/com/android/quickstep/util/GroupTask.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -70,4 +70,10 @@ public class GroupTask {
		task2 != null ? new Task(task2) : null,
		mSplitBounds);
		}

		@Override
		public String toString() {
		return "type=" + taskViewType + " task1=" + task1 + " task2=" + task2;
		}

		}

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -301,9 +301,13 @@ public class DesktopTaskView extends TaskView {
		DesktopRecentsTransitionController recentsController =
		recentsView.getDesktopRecentsController();
		if (recentsController != null) {
		recentsController.launchDesktopFromRecents(this, success -> {
		endCallback.executeAllAndDestroy();
		});
		recentsController.launchDesktopFromRecents(this,
		success -> endCallback.executeAllAndDestroy());
		Log.d(TAG, "launchTaskAnimated - launchDesktopFromRecents: " + Arrays.toString(
		getTaskIds()));
		} else {
		Log.d(TAG, "launchTaskAnimated - recentsController is null: " + Arrays.toString(
		getTaskIds()));
		}

		// Callbacks get run from recentsView for case when recents animation already running

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ import java.util.function.Consumer;
		*/
		public class GroupedTaskView extends TaskView {

		private static final String TAG = TaskView.class.getSimpleName();
		private static final String TAG = GroupedTaskView.class.getSimpleName();
		@Nullable
		private Task mSecondaryTask;
		// TODO(b/336612373): Support new TTV for GroupedTaskView

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

+13 −4

Original line number	Diff line number	Diff line
		@@ -1708,6 +1708,12 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
		return;
		}

		if (taskGroups == null) {
		Log.d(TAG, "applyLoadPlan - taskGroups is null");
		} else {
		Log.d(TAG, "applyLoadPlan - taskGroups: " + taskGroups.stream().map(
		GroupTask::toString).toList());
		}
		mLoadPlanEverApplied = true;
		if (taskGroups == null \|\| taskGroups.isEmpty()) {
		removeTasksViewsAndClearAllButton();
		@@ -2591,7 +2597,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
		*/
		public void onGestureAnimationStart(
		Task[] runningTasks, RotationTouchHelper rotationTouchHelper) {
		Log.d(TAG, "onGestureAnimationStart");
		Log.d(TAG, "onGestureAnimationStart - runningTasks: " + Arrays.toString(runningTasks));
		mActiveGestureRunningTasks = runningTasks;
		// This needs to be called before the other states are set since it can create the task view
		if (mOrientationState.setGestureActive(true)) {
		@@ -2762,6 +2768,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
		* is called. Also scrolls the view to this task.
		*/
		private void showCurrentTask(Task[] runningTasks) {
		Log.d(TAG, "showCurrentTask - runningTasks: " + Arrays.toString(runningTasks));
		if (runningTasks.length == 0) {
		return;
		}
		@@ -5456,8 +5463,9 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
		* Called when a running recents animation has finished or canceled.
		*/
		public void onRecentsAnimationComplete() {
		Log.d(TAG, "onRecentsAnimationComplete - mRecentsAnimationController: "
		+ mRecentsAnimationController);
		Log.d(TAG, "onRecentsAnimationComplete "
		+ "- mRecentsAnimationController: " + mRecentsAnimationController
		+ ", mSideTaskLaunchCallback: " + mSideTaskLaunchCallback);
		// At this point, the recents animation is not running and if the animation was canceled
		// by a display rotation then reset this state to show the screenshot
		setRunningTaskViewShowScreenshot(true);
		@@ -6010,7 +6018,8 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
		}

		public void cleanupRemoteTargets() {
		Log.d(TAG, "cleanupRemoteTargets");
		Log.d(TAG, "cleanupRemoteTargets - mRemoteTargetHandles: " + Arrays.toString(
		mRemoteTargetHandles));
		mRemoteTargetHandles = null;
		}