diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 7af979c9b0..f96e73552a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -418,9 +418,6 @@ public class Workspace extends PagedView } // 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 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 * 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(); diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index dcdf5d6163..8adec27541 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -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]; diff --git a/src/com/android/launcher3/dragndrop/DragDriver.java b/src/com/android/launcher3/dragndrop/DragDriver.java index 01e0f923c1..87461d57fe 100644 --- a/src/com/android/launcher3/dragndrop/DragDriver.java +++ b/src/com/android/launcher3/dragndrop/DragDriver.java @@ -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; } diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 5aae841e22..dd8df88d4f 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -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"; } diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index e43fc8a01c..cae2c3a0e2 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -261,10 +261,6 @@ public abstract class BaseDragLayer } 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;