diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java index 85741eda86..70b139d0ad 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java @@ -197,33 +197,18 @@ public abstract class BaseSwipeUpHandler resultCallback) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "startNewTask1"); - } // Launch the task user scrolled to (mRecentsView.getNextPage()). if (ENABLE_QUICKSTEP_LIVE_TILE.get()) { // We finish recents animation inside launchTask() when live tile is enabled. mRecentsView.getNextPageTaskView().launchTask(false /* animate */, true /* freezeTaskList */); } else { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "startNewTask2"); - } int taskId = mRecentsView.getNextPageTaskView().getTask().key.id; mFinishingRecentsAnimationForNewTaskId = taskId; mRecentsAnimationController.finish(true /* toRecents */, () -> { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "onFinishComplete1"); - } if (!mCanceled) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "onFinishComplete2"); - } TaskView nextTask = mRecentsView.getTaskView(taskId); if (nextTask != null) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "onFinishComplete3"); - } nextTask.launchTask(false /* animate */, true /* freezeTaskList */, success -> { resultCallback.accept(success); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java index 1bd03330fe..8574cf1952 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java @@ -965,9 +965,6 @@ public class LauncherSwipeHandler windowAnim.addListener(new AnimationSuccessListener() { @Override public void onAnimationSuccess(Animator animator) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "onAnimationSuccess"); - } if (mRecentsAnimationController == null) { // If the recents animation is interrupted, we still end the running // animation (not canceled) so this is still called. In that case, we can @@ -1191,9 +1188,6 @@ public class LauncherSwipeHandler } private void switchToScreenshot() { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "switchToScreenshot"); - } final int runningTaskId = mGestureState.getRunningTaskId(); if (ENABLE_QUICKSTEP_LIVE_TILE.get()) { if (mRecentsAnimationController != null) { diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java index 783978d6a8..d1dbcfb12b 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java @@ -91,9 +91,6 @@ public class RecentsAnimationCallbacks implements RemoteAnimationTargetCompat[] appTargets, RemoteAnimationTargetCompat[] wallpaperTargets, Rect homeContentInsets, Rect minimizedHomeBounds) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "onAnimationStart"); - } RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets, wallpaperTargets, homeContentInsets, minimizedHomeBounds); mController = new RecentsAnimationController(animationController, diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index b04a1ae8d1..bbca568472 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -53,9 +53,6 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn @UiThread public RecentsAnimationCallbacks startRecentsAnimation(GestureState gestureState, Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_START_FROM_RECENTS, "startRecentsAnimation"); - } // Notify if recents animation is still running if (mController != null) { String msg = "New recents animation started before old animation completed"; diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 3181752883..015de59db1 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -100,5 +100,4 @@ public final class TestProtocol { public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824"; public static final String APP_NOT_DISABLED = "b/139891609"; public static final String NO_SCROLL_END_WIDGETS = "b/152354290"; - public static final String NO_START_FROM_RECENTS = "b/152658211"; }