Merge "Removing debug tracing for a fixed bug" into ub-launcher3-qt-qpr1-dev (b72cd262) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -161,9 +161,6 @@ public class TaskMenuView extends AbstractFloatingView {
		}

		public static TaskMenuView showForTask(TaskView taskView) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "showForTask");
		}
		BaseDraggingActivity activity = BaseDraggingActivity.fromContext(taskView.getContext());
		final TaskMenuView taskMenuView = (TaskMenuView) activity.getLayoutInflater().inflate(
		R.layout.task_menu, activity.getDragLayer(), false);
		@@ -171,15 +168,9 @@ public class TaskMenuView extends AbstractFloatingView {
		}

		private boolean populateAndShowForTask(TaskView taskView) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "populateAndShowForTask1");
		}
		if (isAttachedToWindow()) {
		return false;
		}
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "populateAndShowForTask2");
		}
		mActivity.getDragLayer().addView(this);
		mTaskView = taskView;
		addMenuOptions(mTaskView);

+0 −3

Original line number	Diff line number	Diff line
		@@ -391,9 +391,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		mIconView.setDrawable(icon);
		mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP));
		mIconView.setOnLongClickListener(v -> {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "setOnLongClickListener");
		}
		requestDisallowInterceptTouchEvent(true);
		return showTaskMenu(Touch.LONGPRESS);
		});

+0 −1

Original line number	Diff line number	Diff line
		@@ -84,5 +84,4 @@ public final class TestProtocol {
		public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824";
		public static final String NO_DRAG_TO_WORKSPACE = "b/138729456";
		public static final String APP_NOT_DISABLED = "b/139891609";
		public static final String WELLBEING_NO_TASK_MENU = "b/141275518";
		}