commit 8dd1ebdb962d994fdab0f71bb130b87c68a14881
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 07 23:05:09 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 07 23:05:09 2018 +0000
tree 0c40b1c657f6989e0a919393f036b265d7e0007d
parent fa8a5ac6155e4bbb35bc898f9e029a682062618a
parent 2fda6ced2aaabb47bef678a9f39b0520380d2773

Merge "Handle transition from multi-window" into ub-launcher3-master

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 a32f6b1..1cf407e 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -159,6 +159,10 @@
         } else if (action == MotionEvent.ACTION_DOWN) {
             mLauncher.finishAutoCancelActionMode();
         }
+        return findActiveController(ev);
+    }
+
+    private boolean findActiveController(MotionEvent ev) {
         mActiveController = null;
 
         AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mLauncher);
@@ -285,8 +289,10 @@
 
         if (mActiveController != null) {
             return mActiveController.onControllerTouchEvent(ev);
+        } else {
+            // In case no child view handled the touch event, we may not get onIntercept anymore
+            return findActiveController(ev);
         }
-        return false;
     }
 
     /**