Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a81d072 authored by Alex Chau's avatar Alex Chau
Browse files

Improve taskId logging for Overview

Fix: 338034523
Test: manual
Flag: NONE
Change-Id: I0ba84047a83bd9bdbd891bddf86f6cbe36bca572
parent 43f65905
Loading
Loading
Loading
Loading
+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;
    }

}
+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;
    }

}
+7 −3
Original line number Diff line number Diff line
@@ -311,9 +311,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
+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,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
+13 −4
Original line number Diff line number Diff line
@@ -1707,6 +1707,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();
@@ -2587,7 +2593,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)) {
@@ -2761,6 +2767,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;
        }
@@ -5457,8 +5464,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);
@@ -6012,7 +6020,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;
    }

Loading