Merge "Cleanup logs for LAUNCH_SPLIT_PAIR" into main (869ef4ad) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/TaskViewUtils.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -38,8 +38,6 @@ import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DU
		import static com.android.launcher3.QuickstepTransitionManager.SPLIT_DIVIDER_ANIM_DURATION;
		import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION;
		import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
		import static com.android.launcher3.testing.shared.TestProtocol.LAUNCH_SPLIT_PAIR;
		import static com.android.launcher3.testing.shared.TestProtocol.testLogD;
		import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE;
		import static com.android.quickstep.views.DesktopTaskView.DESKTOP_MODE_SUPPORTED;

		@@ -427,7 +425,6 @@ public final class TaskViewUtils {
		int initialTaskId, int secondTaskId, @NonNull TransitionInfo transitionInfo,
		SurfaceControl.Transaction t, @NonNull Runnable finishCallback) {
		if (launchingTaskView != null) {
		testLogD(LAUNCH_SPLIT_PAIR, "composeRecentsSplitLaunchAnimator taskView not-null");
		AnimatorSet animatorSet = new AnimatorSet();
		animatorSet.addListener(new AnimatorListenerAdapter() {
		@Override
		@@ -461,7 +458,6 @@ public final class TaskViewUtils {
		for (int i = 0; i < transitionInfo.getChanges().size(); ++i) {
		final TransitionInfo.Change change = transitionInfo.getChanges().get(i);
		if (change.getTaskInfo() == null) {
		testLogD(LAUNCH_SPLIT_PAIR, "changeTaskInfo null; change: " + change);
		continue;
		}
		final int taskId = change.getTaskInfo().taskId;

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ import static com.android.launcher3.Utilities.postAsyncCallback;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_SPLIT_LEFT_TOP;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_SPLIT_RIGHT_BOTTOM;
		import static com.android.launcher3.testing.shared.TestProtocol.LAUNCH_SPLIT_PAIR;
		import static com.android.launcher3.testing.shared.TestProtocol.testLogD;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.launcher3.util.SplitConfigurationOptions.DEFAULT_SPLIT_RATIO;
		@@ -95,8 +93,8 @@ import com.android.quickstep.TaskAnimationManager;
		import com.android.quickstep.TaskViewUtils;
		import com.android.quickstep.views.FloatingTaskView;
		import com.android.quickstep.views.GroupedTaskView;
		import com.android.quickstep.views.SplitInstructionsView;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.SplitInstructionsView;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
		@@ -600,7 +598,6 @@ public class SplitSelectStateController {
		public void startAnimation(IBinder transition, TransitionInfo info,
		SurfaceControl.Transaction t,
		IRemoteTransitionFinishedCallback finishedCallback) {
		testLogD(LAUNCH_SPLIT_PAIR, "Received split startAnimation");
		final Runnable finishAdapter = () -> {
		try {
		finishedCallback.onTransitionFinished(null /* wct /, null / sct */);

tests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -158,10 +158,9 @@ public final class TestProtocol {
		public static final String FLAKY_ACTIVITY_COUNT = "b/260260325";
		public static final String FLAKY_QUICK_SWITCH_TO_PREVIOUS_APP = "b/286084688";
		public static final String ICON_MISSING = "b/282963545";
		public static final String LAUNCH_SPLIT_PAIR = "b/288939273";

		public static final String OVERVIEW_OVER_HOME = "b/279059025";
		public static final String INCORRECT_HOME_STATE = "b/293191790";

		public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";
		public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display";
		public static final String REQUEST_IS_EMULATE_DISPLAY_RUNNING = "is-emulate-display-running";