Merge "Remove TIS command line arg handling" into udc-qpr-dev (af1932eb) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/TouchInteractionService.java

+34 −76

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.LauncherPrefs;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.AnimatedFloat;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.provider.RestoreDbTask;
		@@ -143,8 +142,6 @@ import com.android.wm.shell.transition.IShellTransitions;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.util.Arrays;
		import java.util.LinkedList;
		import java.util.function.Consumer;
		import java.util.function.Function;

		@@ -1274,18 +1271,6 @@ public class TouchInteractionService extends Service

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] rawArgs) {
		if (rawArgs.length > 0 && Utilities.IS_DEBUG_DEVICE) {
		LinkedList<String> args = new LinkedList(Arrays.asList(rawArgs));
		switch (args.pollFirst()) {
		case "cmd":
		if (args.peekFirst() == null) {
		printAvailableCommands(pw);
		} else {
		onCommand(pw, args);
		}
		break;
		}
		} else {
		// Dump everything
		FlagsFactory.dump(pw);
		if (LockedUserState.get(this).isUserUnlocked()) {
		@@ -1322,33 +1307,6 @@ public class TouchInteractionService extends Service
		}
		mTaskbarManager.dumpLogs("", pw);
		}
		}

		private void printAvailableCommands(PrintWriter pw) {
		pw.println("Available commands:");
		pw.println(" clear-touch-log: Clears the touch interaction log");
		pw.println(" print-gesture-log: only prints the ActiveGestureLog dump");
		}

		private void onCommand(PrintWriter pw, LinkedList<String> args) {
		String cmd = args.pollFirst();
		if (cmd == null) {
		pw.println("Command missing");
		printAvailableCommands(pw);
		return;
		}
		switch (cmd) {
		case "clear-touch-log":
		ActiveGestureLog.INSTANCE.clear();
		break;
		case "print-gesture-log":
		ActiveGestureLog.INSTANCE.dump("", pw);
		break;
		default:
		pw.println("Command does not exist: " + cmd);
		printAvailableCommands(pw);
		}
		}

		private AbsSwipeUpHandler createLauncherSwipeHandler(
		GestureState gestureState, long touchTimeMs) {

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -18,12 +18,9 @@ package com.android.quickstep.util;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.launcher3.config.FeatureFlags;

		import java.io.PrintWriter;
		import java.text.SimpleDateFormat;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Date;
		import java.util.List;
		import java.util.Locale;
		@@ -150,10 +147,6 @@ public class ActiveGestureLog {
		lastEventEntries.add(eventEntry);
		}

		public void clear() {
		Arrays.fill(logs, null);
		}

		public void dump(String prefix, PrintWriter writer) {
		writer.println(prefix + "ActiveGestureErrorDetector:");
		for (int i = 0; i < logs.length; i++) {