Removing tracing for fixed bugs (7a4ed2f2) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -194,9 +194,6 @@ 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;

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -439,32 +439,17 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		}

		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);
		@@ -474,14 +459,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		// 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();
		}
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -192,9 +192,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		super(context, attrs, defStyleAttr);
		mActivity = BaseDraggingActivity.fromContext(context);
		setOnClickListener((view) -> {
		if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
		android.util.Log.d(TestProtocol.NO_START_TASK_TAG, "TaskView onClick");
		}
		if (getTask() == null) {
		return;
		}
		@@ -291,9 +288,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {

		public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
		Handler resultCallbackHandler) {
		if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
		android.util.Log.d(TestProtocol.NO_START_TASK_TAG, "launchTask");
		}
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		if (isRunningTask()) {
		getRecentsView().finishRecentsAnimation(false /* toRecents */,
		@@ -308,9 +302,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {

		private void launchTaskInternal(boolean animate, boolean freezeTaskList,
		Consumer<Boolean> resultCallback, Handler resultCallbackHandler) {
		if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
		android.util.Log.d(TestProtocol.NO_START_TASK_TAG, "launchTaskInternal");
		}
		if (mTask != null) {
		final ActivityOptions opts;
		if (animate) {

src/com/android/launcher3/Launcher.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -890,9 +890,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

		@Override
		protected void onStart() {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "Launcher.onStart");
		}
		RaceConditionTracker.onEvent(ON_START_EVT, ENTER);
		super.onStart();
		if (mLauncherCallbacks != null) {

src/com/android/launcher3/LauncherStateManager.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -403,10 +403,6 @@ public class LauncherStateManager {
		}

		private void onStateTransitionStart(LauncherState state) {
		if (TestProtocol.sDebugTracing) {
		android.util.Log.d(TestProtocol.NO_DRAG_TAG,
		"onStateTransitionStart");
		}
		if (mState != state) {
		mState.onStateDisabled(mLauncher);
		}
		@@ -575,10 +571,6 @@ public class LauncherStateManager {
		private final AnimatorSet mAnim;

		public StartAnimRunnable(AnimatorSet anim) {
		if (TestProtocol.sDebugTracing) {
		android.util.Log.d(TestProtocol.NO_DRAG_TAG,
		"StartAnimRunnable");
		}
		mAnim = anim;
		}