Merge "Removing tracing for a fixed flake" into ub-launcher3-master (1db3be37) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Workspace.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -418,9 +418,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
		}

		// Always enter the spring loaded mode
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE, "Switching to SPRING_LOADED");
		}
		mLauncher.getStateManager().goToState(SPRING_LOADED);
		}

		@@ -1760,9 +1757,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
		public void prepareAccessibilityDrop() { }

		public void onDrop(final DragObject d, DragOptions options) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE, "Workspace.onDrop");
		}
		mDragViewVisualCenter = d.getVisualCenter(mDragViewVisualCenter);
		CellLayout dropTargetLayout = mDropToLayout;

		@@ -2440,9 +2434,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
		* to add an item to one of the workspace screens.
		*/
		private void onDropExternal(final int[] touchXY, final CellLayout cellLayout, DragObject d) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE, "Workspace.onDropExternal");
		}
		if (d.dragInfo instanceof PendingAddShortcutInfo) {
		WorkspaceItemInfo si = ((PendingAddShortcutInfo) d.dragInfo)
		.activityInfo.createWorkspaceItemInfo();

+0 −3

Original line number	Diff line number	Diff line
		@@ -594,9 +594,6 @@ public class DragController implements DragDriver.EventListener, TouchController
		}

		private void drop(DropTarget dropTarget, Runnable flingAnimation) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE, "DragController.drop");
		}
		final int[] coordinates = mCoordinatesTemp;
		mDragObject.x = coordinates[0];
		mDragObject.y = coordinates[1];

+0 −6

Original line number	Diff line number	Diff line
		@@ -54,16 +54,10 @@ public abstract class DragDriver {
		mEventListener.onDriverDragMove(ev.getX(), ev.getY());
		break;
		case MotionEvent.ACTION_UP:
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE, "DragDriver.ACTION_UP");
		}
		mEventListener.onDriverDragMove(ev.getX(), ev.getY());
		mEventListener.onDriverDragEnd(ev.getX(), ev.getY());
		break;
		case MotionEvent.ACTION_CANCEL:
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE, "DragDriver.ACTION_CANCEL");
		}
		mEventListener.onDriverDragCancel();
		break;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,6 +86,5 @@ public final class TestProtocol {
		public static final String PERMANENT_DIAG_TAG = "TaplTarget";

		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";
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -261,10 +261,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
		}
		case ACTION_CANCEL:
		case ACTION_UP:
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_DRAG_TO_WORKSPACE,
		"BaseDragLayer.ACTION_UP/CANCEL " + ev);
		}
		mTouchDispatchState &= ~TOUCH_DISPATCHING_GESTURE;
		mTouchDispatchState &= ~TOUCH_DISPATCHING_VIEW;
		break;