Merge "Add logging to debug incorrect taskbar states caught by flaky tests." into tm-dev (2ff0a66b) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -28,10 +28,12 @@ import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.annotation.Nullable;
		import android.content.SharedPreferences;
		import android.util.Log;
		import android.view.ViewConfiguration;

		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
		import com.android.quickstep.AnimatedFloat;
		import com.android.quickstep.SystemUiProxy;
		@@ -566,6 +568,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		* unstashed.
		*/
		public void updateStateForFlag(int flag, boolean enabled) {
		if (flag == FLAG_IN_APP && TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.TASKBAR_IN_APP_STATE, String.format(
		"setting flag FLAG_IN_APP to: %b", enabled), new Exception());
		}
		if (enabled) {
		mState \|= flag;
		} else {
		@@ -667,6 +673,14 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		}
		boolean isStashed = mStashCondition.test(flags);
		if (mIsStashed != isStashed) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.TASKBAR_IN_APP_STATE, String.format(
		"setState: mIsStashed=%b, isStashed=%b, duration=%d, start=:%b",
		mIsStashed,
		isStashed,
		duration,
		start));
		}
		mIsStashed = isStashed;

		// This sets mAnimator.

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,6 +136,6 @@ public final class TestProtocol {
		public static final String NO_DROP_TARGET = "b/195031154";
		public static final String NULL_INT_SET = "b/200572078";
		public static final String MISSING_PROMISE_ICON = "b/202985412";

		public static final String BAD_STATE = "b/223498680";
		public static final String TASKBAR_IN_APP_STATE = "b/227657604";
		}