Fixing swipe on nav-bar does not work on launcher when in multi-window mode

Change-Id: I0d2a15c14efc48455af1aaf829504fd3bb31c0a5

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index a32f6b1dc..1cf407eb9 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -159,6 +159,10 @@ public class DragLayer extends InsettableFrameLayout {
         } 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 @@ public class DragLayer extends InsettableFrameLayout {
 
         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;
     }
 
     /**