diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-05 21:57:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-05 21:57:01 +0000 |
| commit | 243dd30da31df6153e255368c3cc748decd45127 (patch) | |
| tree | 4f056189b9815911b391ae398232de351da1b3d0 /src | |
| parent | d785fc289cd44be7460b6ab12bf6745066078ea8 (diff) | |
| parent | 30618db33f511d6838d39f379ec72f54b7c6eff8 (diff) | |
| download | android_packages_apps_Trebuchet-243dd30da31df6153e255368c3cc748decd45127.tar.gz android_packages_apps_Trebuchet-243dd30da31df6153e255368c3cc748decd45127.tar.bz2 android_packages_apps_Trebuchet-243dd30da31df6153e255368c3cc748decd45127.zip | |
Merge "Add tracing for non-dragging icon" into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragDriver.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/BaseDragLayer.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragDriver.java b/src/com/android/launcher3/dragndrop/DragDriver.java index bd2a03b6c..01e0f923c 100644 --- a/src/com/android/launcher3/dragndrop/DragDriver.java +++ b/src/com/android/launcher3/dragndrop/DragDriver.java @@ -61,6 +61,9 @@ public abstract class DragDriver { 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/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index 799762d8f..c08b65931 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -29,6 +29,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.os.Build; import android.util.AttributeSet; +import android.util.Log; import android.util.Property; import android.view.MotionEvent; import android.view.View; @@ -41,6 +42,7 @@ import android.widget.FrameLayout; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.Utilities; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.util.MultiValueAlpha; import com.android.launcher3.util.MultiValueAlpha.AlphaProperty; import com.android.launcher3.util.TouchController; @@ -261,6 +263,10 @@ 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; |