diff options
author | vadimt <vadimt@google.com> | 2019-08-30 18:10:34 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-30 18:10:34 -0700 |
commit | 7e6ba0e5bf2ee1226aff5db27395bc7f143604d6 (patch) | |
tree | 95d60175db24d85d839454f06a4a279b6b0e2568 | |
parent | 4feff8ba95c91950b0206727b0b166a49b1b1af6 (diff) | |
parent | 78ebf57e9fd3cd3e48356c61d7c890b4466dafee (diff) | |
download | android_packages_apps_Trebuchet-7e6ba0e5bf2ee1226aff5db27395bc7f143604d6.tar.gz android_packages_apps_Trebuchet-7e6ba0e5bf2ee1226aff5db27395bc7f143604d6.tar.bz2 android_packages_apps_Trebuchet-7e6ba0e5bf2ee1226aff5db27395bc7f143604d6.zip |
Merge "Adding tracing for mismatch between current and stable states" into ub-launcher3-qt-qpr1-dev
am: 78ebf57e9f
Change-Id: Ifac50ddd7ad0a689722e4911a735cf2d503d177a
-rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 14 | ||||
-rw-r--r-- | src/com/android/launcher3/testing/TestProtocol.java | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index e1ea3be04..63914b0eb 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -228,8 +228,9 @@ public class LauncherStateManager { private void goToState(LauncherState state, boolean animated, long delay, final Runnable onCompleteRunnable) { if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.ALL_APPS_UPON_RECENTS, "goToState: " + state + " @ " + - Log.getStackTraceString(new Throwable())); + Log.d(TestProtocol.ALL_APPS_UPON_RECENTS, "goToState: " + + state.getClass().getSimpleName() + + " @ " + Log.getStackTraceString(new Throwable())); } animated &= Utilities.areAnimationsEnabled(mLauncher); if (mLauncher.isInState(state)) { @@ -411,6 +412,11 @@ public class LauncherStateManager { mState.onStateDisabled(mLauncher); } mState = state; + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.STABLE_STATE_MISMATCH, "onStateTransitionStart: " + + state.getClass().getSimpleName() + + " @ " + Log.getStackTraceString(new Throwable())); + } mState.onStateEnabled(mLauncher); mLauncher.onStateSet(mState); @@ -431,7 +437,9 @@ public class LauncherStateManager { mLastStableState = state.getHistoryForState(mCurrentStableState); mCurrentStableState = state; if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.ALL_APPS_UPON_RECENTS, "onStateTransitionEnd: " + state); + Log.d(TestProtocol.ALL_APPS_UPON_RECENTS, "onStateTransitionEnd: " + + state.getClass().getSimpleName() + + " @ " + Log.getStackTraceString(new Throwable())); } } diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 520598adf..d569d4007 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -83,4 +83,5 @@ public final class TestProtocol { public static final String NO_DRAG_TO_WORKSPACE = "b/138729456"; public static final String APP_NOT_DISABLED = "b/139891609"; public static final String ALL_APPS_UPON_RECENTS = "b/139941530"; + public static final String STABLE_STATE_MISMATCH = "b/140311911"; } |