Merge "Adding tracing for mismatch between current and stable states" into ub-launcher3-qt-qpr1-dev (7e6ba0e5) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/LauncherStateManager.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -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()));
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -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";
		}