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

Commit f87a1ec9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add permanent TaskView logs to track taskIds being launched" into main

parents 6fc5e7a0 aa10f54a

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

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.graphics.Point; 
import android.graphics.PointF;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Pair;

import android.view.MotionEvent;

import android.view.View;
@@ -43,6 +44,7 @@ import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosi 


import kotlin.Unit;



import java.util.Arrays;

import java.util.HashMap;

import java.util.function.Consumer;
@@ -58,6 +60,7 @@ import java.util.function.Consumer; 
 */

public class GroupedTaskView extends TaskView {



    private static final String TAG = TaskView.class.getSimpleName();

    @Nullable

    private Task mSecondaryTask;

    private TaskThumbnailView mSnapshotView2;
@@ -258,7 +261,6 @@ public class GroupedTaskView extends TaskView { 
            InteractionJankMonitorWrapper.end(Cuj.CUJ_SPLIT_SCREEN_ENTER);

        }, false /* freezeTaskList */, true /*launchingExistingTaskview*/);





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

        recentsView.addSideTaskLaunchCallback(endCallback);

        return endCallback;
@@ -281,6 +283,8 @@ public class GroupedTaskView extends TaskView { 
                launchingExistingTaskView ? this : null, mTask.key.id,

                mSecondaryTask.key.id, SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT,

                callback, isQuickswitch, getSnapPosition());

        Log.d(TAG, "launchTaskInternal - launchExistingSplitPair: " + Arrays.toString(

                getTaskIds()));

    }



    @Override

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

+5 −0
Original line number Diff line number Diff line
@@ -869,6 +869,8 @@ public class TaskView extends FrameLayout implements Reusable { 
                    getDisplay() == null ? DEFAULT_DISPLAY : getDisplay().getDisplayId());

            if (ActivityManagerWrapper.getInstance()

                    .startActivityFromRecents(mTask.key, opts.options)) {

                Log.d(TAG, "launchTaskAnimated - startActivityFromRecents: " + Arrays.toString(

                        getTaskIds()));

                ActiveGestureLog.INSTANCE.trackEvent(EXPECTING_TASK_APPEARED);

                RecentsView recentsView = getRecentsView();

                if (recentsView.getRunningTaskViewId() != -1) {
@@ -894,6 +896,7 @@ public class TaskView extends FrameLayout implements Reusable { 
                return null;

            }

        } else {

            Log.d(TAG, "launchTaskAnimated - mTask is null");

            return null;

        }

    }
@@ -1035,6 +1038,8 @@ public class TaskView extends FrameLayout implements Reusable { 
                }

            });

            anim.start();

            Log.d(TAG, "launchTasks - composeRecentsLaunchAnimator: " + Arrays.toString(

                    getTaskIds()));

            recentsView.onTaskLaunchedInLiveTileMode();

            return runnableList;

        } else {