From 155ce05218a92b1ece1069a8f0e7da56e23bd661 Mon Sep 17 00:00:00 2001 From: vadimt Date: Tue, 14 Sep 2021 14:01:01 -0700 Subject: [PATCH] Removing unused tracing Test: presubmit Bug: 192018189 Change-Id: I31e6fd8410e879aeda0249d89f650e1a41de6030 --- .../android/quickstep/AbsSwipeUpHandler.java | 20 ------------------- .../quickstep/FallbackSwipeHandler.java | 6 ------ .../quickstep/RecentsAnimationCallbacks.java | 9 --------- .../OtherActivityInputConsumer.java | 7 ------- .../launcher3/statemanager/StateManager.java | 12 ----------- .../launcher3/testing/TestProtocol.java | 1 - 6 files changed, 55 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 1e841da40b..a5309cc4bd 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -65,7 +65,6 @@ import android.graphics.RectF; import android.os.Build; import android.os.IBinder; import android.os.SystemClock; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.View.OnApplyWindowInsetsListener; @@ -88,7 +87,6 @@ import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; -import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.tracing.InputConsumerProto; import com.android.launcher3.tracing.SwipeHandlerProto; import com.android.launcher3.util.TraceHelper; @@ -883,9 +881,6 @@ public abstract class AbsSwipeUpHandler, */ @UiThread public void onGestureEnded(float endVelocity, PointF velocity, PointF downPos) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "3"); - } float flingThreshold = mContext.getResources() .getDimension(R.dimen.quickstep_fling_threshold_speed); boolean isFling = mGestureStarted && !mIsMotionPaused @@ -1048,9 +1043,6 @@ public abstract class AbsSwipeUpHandler, @UiThread private void handleNormalGestureEnd(float endVelocity, boolean isFling, PointF velocity, boolean isCancel) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "4"); - } long duration = MAX_SWIPE_DURATION; float currentShift = mCurrentShift.value; final GestureEndTarget endTarget = calculateEndTarget(velocity, endVelocity, @@ -1169,9 +1161,6 @@ public abstract class AbsSwipeUpHandler, @UiThread private void animateToProgress(float start, float end, long duration, Interpolator interpolator, GestureEndTarget target, PointF velocityPxPerMs) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "5"); - } runOnRecentsAnimationStart(() -> animateToProgressInternal(start, end, duration, interpolator, target, velocityPxPerMs)); } @@ -1222,9 +1211,6 @@ public abstract class AbsSwipeUpHandler, } } - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "7, end target=" + mGestureState.getEndTarget()); - } if (mGestureState.getEndTarget() == HOME) { getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs); final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null @@ -1239,9 +1225,6 @@ public abstract class AbsSwipeUpHandler, && runningTaskTarget.allowEnterPip && runningTaskTarget.taskInfo.pictureInPictureParams != null && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled(); - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "8, class=" + getClass().getSimpleName()); - } HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip, runningTaskTarget); @@ -1840,9 +1823,6 @@ public abstract class AbsSwipeUpHandler, * be run when it is next started. */ protected void runOnRecentsAnimationStart(Runnable action) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "6"); - } if (mRecentsAnimationTargets == null) { mRecentsAnimationStartCallbacks.add(action); } else { diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java index 80ae65ee42..c1b45e0257 100644 --- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java @@ -45,7 +45,6 @@ import android.os.Message; import android.os.Messenger; import android.os.ParcelUuid; import android.os.UserHandle; -import android.util.Log; import android.view.Surface; import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; @@ -58,7 +57,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.SpringAnimationBuilder; -import com.android.launcher3.testing.TestProtocol; import com.android.quickstep.fallback.FallbackRecentsView; import com.android.quickstep.fallback.RecentsState; import com.android.quickstep.util.AppCloseConfig; @@ -141,10 +139,6 @@ public class FallbackSwipeHandler extends mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration); ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0); Intent intent = new Intent(mGestureState.getHomeIntent()); - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, - "createHomeAnimationFactory: " + intent.toShortString(true, true, true, false)); - } mActiveAnimationFactory.addGestureContract(intent); try { mContext.startActivity(intent, options.toBundle()); diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java index 3c05a3e4ce..e9482219de 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java @@ -20,14 +20,12 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACT import android.graphics.Rect; import android.util.ArraySet; -import android.util.Log; import android.view.RemoteAnimationTarget; import androidx.annotation.BinderThread; import androidx.annotation.UiThread; import com.android.launcher3.Utilities; -import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.util.Preconditions; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.RecentsAnimationControllerCompat; @@ -97,9 +95,6 @@ public class RecentsAnimationCallbacks implements RemoteAnimationTargetCompat[] appTargets, RemoteAnimationTargetCompat[] wallpaperTargets, Rect homeContentInsets, Rect minimizedHomeBounds) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "RecentsAnimationCallbacks.onAnimationStart"); - } // Convert appTargets to type RemoteAnimationTarget for all apps except Home app RemoteAnimationTarget[] nonHomeApps = Arrays.stream(appTargets) .filter(remoteAnimationTarget -> @@ -121,10 +116,6 @@ public class RecentsAnimationCallbacks implements mController::finishAnimationToApp); } else { Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, - "RecentsAnimationCallbacks.onAnimationStart callback"); - } for (RecentsAnimationListener listener : getListeners()) { listener.onRecentsAnimationStart(mController, targets); } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index e6285f2902..725c7c45a5 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -50,7 +50,6 @@ import android.view.ViewConfiguration; import androidx.annotation.UiThread; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.tracing.InputConsumerProto; @@ -357,9 +356,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC } case ACTION_CANCEL: case ACTION_UP: { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "1"); - } if (DEBUG_FAILED_QUICKSWITCH && !mPassedWindowMoveSlop) { float displacementX = mLastPos.x - mDownPos.x; float displacementY = mLastPos.y - mDownPos.y; @@ -413,9 +409,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC * the animation can still be running. */ private void finishTouchTracking(MotionEvent ev) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "2"); - } Object traceToken = TraceHelper.INSTANCE.beginSection(UP_EVT, FLAG_CHECK_FOR_RACE_CONDITIONS); diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java index 24d3fd4e38..b34af975bd 100644 --- a/src/com/android/launcher3/statemanager/StateManager.java +++ b/src/com/android/launcher3/statemanager/StateManager.java @@ -18,7 +18,6 @@ package com.android.launcher3.statemanager; import static android.animation.ValueAnimator.areAnimatorsEnabled; -import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.anim.AnimatorPlaybackController.callListenerCommandRecursively; import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS; @@ -28,14 +27,12 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.os.Handler; import android.os.Looper; -import android.util.Log; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.states.StateAnimationConfig.AnimationFlags; -import com.android.launcher3.testing.TestProtocol; import java.io.PrintWriter; import java.util.ArrayList; @@ -256,9 +253,6 @@ public class StateManager> { if (listener != null) { animation.addListener(listener); } - if (TestProtocol.sDebugTracing && state == NORMAL) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "goToStateAnimated: " + state); - } mUiHandler.post(new StartAnimRunnable(animation)); } @@ -334,17 +328,11 @@ public class StateManager> { @Override public void onAnimationStart(Animator animation) { // Change the internal state only when the transition actually starts - if (TestProtocol.sDebugTracing && state == NORMAL) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "onAnimationStart: " + state); - } onStateTransitionStart(state); } @Override public void onAnimationSuccess(Animator animator) { - if (TestProtocol.sDebugTracing && state == NORMAL) { - Log.d(TestProtocol.L3_SWIPE_TO_HOME, "onAnimationEnd: " + state); - } onStateTransitionEnd(state); } }; diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index ed52e20a34..43d8e5defe 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -118,6 +118,5 @@ public final class TestProtocol { public static final String WORK_PROFILE_REMOVED = "b/159671700"; public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015"; public static final String TASK_VIEW_ID_CRASH = "b/195430732"; - public static final String L3_SWIPE_TO_HOME = "b/192018189"; public static final String NO_DROP_TARGET = "b/195031154"; }