diff options
author | vadimt <vadimt@google.com> | 2019-06-06 17:00:57 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-06-06 17:00:57 -0700 |
commit | 0f08db5eebb962a8515bde6f15cc51723b144ebd (patch) | |
tree | 193805a35abd0561715d2d4b2a81308b0f77309e /quickstep | |
parent | 63013c5e5723117ce7dec97b88cac2abf21f9088 (diff) | |
download | android_packages_apps_Trebuchet-0f08db5eebb962a8515bde6f15cc51723b144ebd.tar.gz android_packages_apps_Trebuchet-0f08db5eebb962a8515bde6f15cc51723b144ebd.tar.bz2 android_packages_apps_Trebuchet-0f08db5eebb962a8515bde6f15cc51723b144ebd.zip |
Add tracing for b/134532571
Bug: 134172603
Bug: 134532571
Change-Id: I75c8e0212a9b35d33842d5380fbe733b486be932
Diffstat (limited to 'quickstep')
2 files changed, 28 insertions, 0 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java index d0a41f3b5..1b82bcb57 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -36,6 +36,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; import android.os.UserHandle; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.animation.Interpolator; @@ -53,6 +54,7 @@ import com.android.launcher3.allapps.DiscoveryBounce; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.SpringObjectAnimator; import com.android.launcher3.compat.AccessibilityManagerCompat; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.views.FloatingIconView; import com.android.quickstep.SysUINavigationMode.Mode; @@ -174,6 +176,9 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe @Override public AnimationFactory prepareRecentsUI(Launcher activity, boolean activityVisible, boolean animateActivity, Consumer<AnimatorPlaybackController> callback) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "prepareRecentsUI"); + } final LauncherState startState = activity.getStateManager().getState(); LauncherState resetState = startState; diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 87b732664..0f66ed843 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -59,6 +59,7 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; +import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; import android.view.View; @@ -83,6 +84,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.graphics.RotationMode; import com.android.launcher3.logging.UserEventDispatcher; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; @@ -457,17 +459,32 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> } private void onLauncherStart(final T activity) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart"); + } if (mActivity != activity) { return; } + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart 1"); + } if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) { return; } + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart 2"); + } // If we've already ended the gesture and are going home, don't prepare recents UI, // as that will set the state as BACKGROUND_APP, overriding the animation to NORMAL. if (mGestureEndTarget != HOME) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart 3"); + } Runnable initAnimFactory = () -> { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart 4"); + } mAnimationFactory = mActivityControlHelper.prepareRecentsUI(mActivity, mWasLauncherAlreadyVisible, true, this::onAnimatorPlaybackControllerCreated); @@ -477,8 +494,14 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> // Launcher is visible, but might be about to stop. Thus, if we prepare recents // now, it might get overridden by moveToRestState() in onStop(). To avoid this, // wait until the next gesture (and possibly launcher) starts. + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart 5"); + } mStateCallback.addCallback(STATE_GESTURE_STARTED, initAnimFactory); } else { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart 6"); + } initAnimFactory.run(); } } |