diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 2fedb6f38c..cceaf278b4 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -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; @@ -1649,12 +1647,6 @@ public abstract class AbsSwipeUpHandler 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; diff --git a/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java b/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java index 4bcbbe0717..ce6f310201 100644 --- a/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java +++ b/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java @@ -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"; diff --git a/tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java b/tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java index 3f9699926c..200f2fff17 100644 --- a/tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java +++ b/tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java @@ -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); } } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 0a52955cbe..ba8121f25d 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -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(); diff --git a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java index 70d63bd817..672c6e0c8c 100644 --- a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java +++ b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java @@ -18,8 +18,6 @@ package com.android.launcher3.tapl; import static com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_MAIN; import static com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_PILFER; import static com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_TIS; -import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS; -import static com.android.launcher3.testing.shared.TestProtocol.testLogD; import android.os.SystemClock; @@ -90,7 +88,6 @@ public class LogEventChecker { } String verify(long waitForExpectedCountMs, boolean successfulGesture) { - testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "LogEventChecker.java - verify"); final ListMap actualEvents = finishSync(waitForExpectedCountMs); if (actualEvents == null) return "null event sequences because launcher likely died"; diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java index 99da5c38ae..6f420afe78 100644 --- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java +++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java @@ -19,10 +19,8 @@ package com.android.launcher3.tapl; import static com.android.launcher3.tapl.OverviewTask.OverviewSplitTask.DEFAULT; import static com.android.launcher3.tapl.OverviewTask.OverviewSplitTask.SPLIT_BOTTOM_OR_RIGHT; import static com.android.launcher3.tapl.OverviewTask.OverviewSplitTask.SPLIT_TOP_OR_LEFT; -import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS; import android.graphics.Rect; -import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -222,7 +220,6 @@ public final class OverviewTask { return new LaunchedAppState(mLauncher); } } else { - Log.d(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "TaskView.launchTaskAnimated"); mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT); return new LaunchedAppState(mLauncher); }