commit 960a7fe15eb5145237f6d7aca64b469be835b70a
author Tony Wickham <twickham@google.com> Thu Aug 04 21:09:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 21:09:29 2016 +0000
tree 033f372aa89e3b653fd58e7af6b0a040bdafa703
parent 50941fb8a6ba4e1b6fca6cbf35e1a5efca7156f3
parent 98cbd62e1f6d57ccef1758fb82dd245f7354fb73

Merge "Reset mActiveController to null in DragLayer.onInterceptTouchEvent()." into ub-launcher3-calgary

src/com/android/launcher3/dragndrop/DragLayer.java

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;