From 34b2f03b308a7e3afcebe6e57d929d2950461b3c Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 10 Jun 2019 11:26:37 -0700 Subject: [PATCH] More tracing for b/133009122 Bug: 133009122 Change-Id: I09a95b88ea55e1759151b2bcd5ede0c1efa38e7e --- .../android/launcher3/dragndrop/BaseItemDragListener.java | 4 ++++ .../android/launcher3/popup/PopupContainerWithArrow.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java index e204c63017..c719c1c986 100644 --- a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java +++ b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java @@ -37,6 +37,7 @@ import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.states.InternalStateHandler; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.widget.PendingItemDragHelper; import java.util.UUID; @@ -136,6 +137,9 @@ public abstract class BaseItemDragListener extends InternalStateHandler implemen @Override public boolean shouldStartDrag(double distanceDragged) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_DRAG_TAG, "BIDL.shouldStartDrag"); + } // Stay in pre-drag mode, if workspace is locked. return !mLauncher.isWorkspaceLocked(); } diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 7b14fa2491..9719a1892f 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -36,6 +36,7 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; import android.util.AttributeSet; +import android.util.Log; import android.util.Pair; import android.view.MotionEvent; import android.view.View; @@ -67,6 +68,7 @@ import com.android.launcher3.popup.PopupDataProvider.PopupDataChangeListener; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.touch.ItemClickHandler; import com.android.launcher3.touch.ItemLongClickListener; import com.android.launcher3.util.PackageUserKey; @@ -447,6 +449,11 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource, @Override public boolean shouldStartDrag(double distanceDragged) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_DRAG_TAG, + "createPreDragCondition().shouldStartDrag " + distanceDragged + ", " + + mStartDragThreshold); + } return distanceDragged > mStartDragThreshold; }