diff options
| author | Tony Wickham <twickham@google.com> | 2016-08-04 11:52:18 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-08-04 11:52:18 -0700 |
| commit | 98cbd62e1f6d57ccef1758fb82dd245f7354fb73 (patch) | |
| tree | 0c3ce2d045b92b9cbcfb44026cd292f2bc7c1363 /src/com/android/launcher3/dragndrop | |
| parent | 5a5eb846c410c6ed6c1c0fb01edf82e118c35830 (diff) | |
| download | android_packages_apps_Trebuchet-98cbd62e1f6d57ccef1758fb82dd245f7354fb73.tar.gz android_packages_apps_Trebuchet-98cbd62e1f6d57ccef1758fb82dd245f7354fb73.tar.bz2 android_packages_apps_Trebuchet-98cbd62e1f6d57ccef1758fb82dd245f7354fb73.zip | |
Reset mActiveController to null in DragLayer.onInterceptTouchEvent().
Otherwise the previous active controller will continue to handle touch
events even if it doesn't re-intercept future touches. For instance,
All Apps was handling the swipe gesture after DragLayer intercepted to
close a shortcuts container, which led to the weird behavior described
in the bug.
Bug: 30590854
Change-Id: I247b39b03d336a04659f6ce644380bf3cef8de3f
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 3300b7699..448f70943 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -295,6 +295,8 @@ public class DragLayer extends InsettableFrameLayout { } clearAllResizeFrames(); + mActiveController = null; + if (mDragController.onInterceptTouchEvent(ev)) { mActiveController = mDragController; return true; |