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

Commit 77d3524b authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Android (Google) Code Review
Browse files

Merge "Remove debug tracing for b/332386996" into main

parents 08c3118e abf9f308

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+0 −8
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH 
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_GESTURE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;

import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS;

import static com.android.launcher3.testing.shared.TestProtocol.testLogD;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
@@ -1651,12 +1649,6 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
                        int taskToLaunch = mRecentsView.getNextPage();

                        int runningTask = getLastAppearedTaskIndex();

                        boolean hasStartedNewTask = hasStartedNewTask();

                        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                                "taskToLaunch=" + taskToLaunch);

                        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                                "runningTask=" + runningTask);

                        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                                "hasStartedNewTask=" + hasStartedNewTask);

                        if (target == NEW_TASK && taskToLaunch == runningTask

                                && !hasStartedNewTask) {

                            // We are about to launch the current running task, so use LAST_TASK

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

+0 −17
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncest 
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;

import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_NOT_PINNABLE;

import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS;

import static com.android.launcher3.testing.shared.TestProtocol.testLogD;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
@@ -649,7 +647,6 @@ public class TaskView extends FrameLayout implements Reusable { 
     */

    public void bind(Task task, RecentsOrientedState orientedState) {

        cancelPendingLoadTasks();

        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "TaskView.bind: task=" + task);

        mTask = task;

        mTaskIdContainer[0] = mTask.key.id;

        mTaskIdAttributeContainer[0] = new TaskIdAttributeContainer(task, mSnapshotView, mIconView,
@@ -863,11 +860,7 @@ public class TaskView extends FrameLayout implements Reusable { 
     */

    @Nullable

    public RunnableList launchTaskAnimated() {

        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                "TaskView.launchTaskAnimated: mTask=" + mTask);

        if (mTask != null) {

            testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                    "TaskView.launchTaskAnimated: startActivityFromRecentsAsync");

            TestLogging.recordEvent(

                    TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);

            ActivityOptionsWrapper opts =  mContainer.getActivityLaunchOptions(this, null);
@@ -915,10 +908,7 @@ public class TaskView extends FrameLayout implements Reusable { 
     * Starts the task associated with this view without any animation

     */

    public void launchTask(@NonNull Consumer<Boolean> callback, boolean isQuickswitch) {

        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "TaskView.launchTask: mTask=" + mTask);

        if (mTask != null) {

            testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                    "TaskView.launchTask: startActivityFromRecentsAsync");

            TestLogging.recordEvent(

                    TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
@@ -986,9 +976,6 @@ public class TaskView extends FrameLayout implements Reusable { 
    public RunnableList launchTasks() {

        RecentsView recentsView = getRecentsView();

        RemoteTargetHandle[] remoteTargetHandles = recentsView.mRemoteTargetHandles;

        testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                "TaskView.launchTasks: isRunningTask=" + isRunningTask() + ", "

                        + "remoteTargetHandles == null?" + (remoteTargetHandles == null));

        if (isRunningTask() && remoteTargetHandles != null) {

            if (!mIsClickableAsLiveTile) {

                Log.e(TAG, "TaskView is not clickable as a live tile; returning to home.");
@@ -1015,8 +1002,6 @@ 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.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"
@@ -1037,8 +1022,6 @@ 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.launchTasks: onAnimationEnd");

                        launchTaskAnimated();

                    }

                    mIsClickableAsLiveTile = true;

tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ public final class TestProtocol { 
    public static final String ICON_MISSING = "b/282963545";

    public static final String OVERVIEW_OVER_HOME = "b/279059025";

    public static final String UIOBJECT_STALE_ELEMENT = "b/319501259";

    public static final String SUCCESSFUL_GESTURE_MISMATCH_EVENTS = "b/324940434";

    public static final String TEST_DRAG_APP_ICON_TO_MULTIPLE_WORKSPACES_FAILURE = "b/326908466";

    public static final String TEST_TAPL_OVERVIEW_ACTIONS_MENU_FAILURE = "b/326073471";

    public static final String WIDGET_CONFIG_NULL_EXTRA_INTENT = "b/324419890";

tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java

+0 −4
Original line number Diff line number Diff line
@@ -24,13 +24,11 @@ import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_ENABLE_B 
import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_SHELL_DRAG_READY;

import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_STASHED_TASKBAR_SCALE;

import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_TASKBAR_FROM_NAV_THRESHOLD;

import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS;

import static com.android.launcher3.testing.shared.TestProtocol.TEST_INFO_RESPONSE_FIELD;



import android.graphics.Point;

import android.graphics.Rect;

import android.os.SystemClock;

import android.util.Log;

import android.view.InputDevice;

import android.view.MotionEvent;

import android.view.ViewConfiguration;
@@ -141,8 +139,6 @@ public final class LaunchedAppState extends Background { 


            return new Taskbar(mLauncher);

        } finally {

            Log.d(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                    "swipeUpToUnstashTaskbar: completed gesture");

            mLauncher.getTestInfo(REQUEST_DISABLE_BLOCK_TIMEOUT);

        }

    }

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+0 −6
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ import static com.android.launcher3.tapl.TestHelpers.getOverviewPackageName; 
import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL;

import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_GET_SPLIT_SELECTION_ACTIVE;

import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_NUM_ALL_APPS_COLUMNS;

import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS;

import static com.android.launcher3.testing.shared.TestProtocol.TEST_DRAG_APP_ICON_TO_MULTIPLE_WORKSPACES_FAILURE;

import static com.android.launcher3.testing.shared.TestProtocol.TEST_INFO_RESPONSE_FIELD;

import static com.android.launcher3.testing.shared.TestProtocol.testLogD;



import android.app.ActivityManager;

import android.app.Instrumentation;
@@ -2400,13 +2398,9 @@ public final class LauncherInstrumentation { 
            }



            if (mEventChecker != null) {

                testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "eventsCheck: mEventChecker exists");

                mEventChecker = null;

                if (mCheckEventsForSuccessfulGestures) {

                    final String message = eventChecker.verify(WAIT_TIME_MS, true);

                    testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS,

                            "mCheckEventsForSuccessfulGestures = true | eventsCheck: message="

                                    + message);

                    if (message != null) {

                        dumpDiagnostics(message);

                        checkForAnomaly();