Merge "Removing tracing for fixed bug" into ub-launcher3-rvc-dev am: 9398772fb8 (1ce281c5) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −15

Original line number	Diff line number	Diff line
		@@ -197,33 +197,18 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		}

		protected void startNewTask(int successStateFlag, Consumer<Boolean> resultCallback) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "startNewTask1");
		}
		// Launch the task user scrolled to (mRecentsView.getNextPage()).
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		// We finish recents animation inside launchTask() when live tile is enabled.
		mRecentsView.getNextPageTaskView().launchTask(false /* animate */,
		true /* freezeTaskList */);
		} else {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "startNewTask2");
		}
		int taskId = mRecentsView.getNextPageTaskView().getTask().key.id;
		mFinishingRecentsAnimationForNewTaskId = taskId;
		mRecentsAnimationController.finish(true /* toRecents */, () -> {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "onFinishComplete1");
		}
		if (!mCanceled) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "onFinishComplete2");
		}
		TaskView nextTask = mRecentsView.getTaskView(taskId);
		if (nextTask != null) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "onFinishComplete3");
		}
		nextTask.launchTask(false /* animate /, true / freezeTaskList */,
		success -> {
		resultCallback.accept(success);

+0 −6

Original line number	Diff line number	Diff line
		@@ -965,9 +965,6 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
		windowAnim.addListener(new AnimationSuccessListener() {
		@Override
		public void onAnimationSuccess(Animator animator) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "onAnimationSuccess");
		}
		if (mRecentsAnimationController == null) {
		// If the recents animation is interrupted, we still end the running
		// animation (not canceled) so this is still called. In that case, we can
		@@ -1191,9 +1188,6 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
		}

		private void switchToScreenshot() {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "switchToScreenshot");
		}
		final int runningTaskId = mGestureState.getRunningTaskId();
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		if (mRecentsAnimationController != null) {

+0 −3

Original line number	Diff line number	Diff line
		@@ -91,9 +91,6 @@ public class RecentsAnimationCallbacks implements
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		Rect homeContentInsets, Rect minimizedHomeBounds) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "onAnimationStart");
		}
		RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets,
		wallpaperTargets, homeContentInsets, minimizedHomeBounds);
		mController = new RecentsAnimationController(animationController,

+0 −3

Original line number	Diff line number	Diff line
		@@ -53,9 +53,6 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
		@UiThread
		public RecentsAnimationCallbacks startRecentsAnimation(GestureState gestureState,
		Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_START_FROM_RECENTS, "startRecentsAnimation");
		}
		// Notify if recents animation is still running
		if (mController != null) {
		String msg = "New recents animation started before old animation completed";

+0 −1

Original line number	Diff line number	Diff line
		@@ -100,5 +100,4 @@ public final class TestProtocol {
		public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824";
		public static final String APP_NOT_DISABLED = "b/139891609";
		public static final String NO_SCROLL_END_WIDGETS = "b/152354290";
		public static final String NO_START_FROM_RECENTS = "b/152658211";
		}