| commit | 45f44d6c3b2d6e3a60cd8f19a654a9470497c77f | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Thu Aug 04 21:43:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 04 21:43:16 2016 +0000 |
| tree | 033f372aa89e3b653fd58e7af6b0a040bdafa703 | |
| parent | 27ac38483d56427cc446fb0e2f4cf0d1d1514e74 [diff] | |
| parent | 98cbd62e1f6d57ccef1758fb82dd245f7354fb73 [diff] |
Reset mActiveController to null in DragLayer.onInterceptTouchEvent(). am: 98cbd62e1f Change-Id: I3522946f6da6c895ccded2da36a6fc5eed0ae178
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 3300b76..448f709 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -295,6 +295,8 @@ } clearAllResizeFrames(); + mActiveController = null; + if (mDragController.onInterceptTouchEvent(ev)) { mActiveController = mDragController; return true;