Merge "Always cancel forwarding on ACTION_UP or ACTION_CANCEL." into ub-launcher3-calgary

1 files changed, 5 insertions, 6 deletions

diff --git a/src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java b/src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java
index 507939a8e..31f096990 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java
@@ -218,8 +218,12 @@ public class ShortcutsContainerListener implements View.OnTouchListener,
         if (dst == null) {
             return false;
         }
+        // Always cancel forwarding when the touch stream ends.
+        final int action = srcEvent.getActionMasked();
+        final boolean keepForwarding = action != MotionEvent.ACTION_UP
+                && action != MotionEvent.ACTION_CANCEL;
         if (!dst.isLaidOut()) {
-            return true;
+            return keepForwarding;
         }
 
         // Convert event to destination-local coordinates.
@@ -236,11 +240,6 @@ public class ShortcutsContainerListener implements View.OnTouchListener,
         final boolean handled = dst.onForwardedEvent(dstEvent, mActivePointerId, mTouchDown);
         dstEvent.recycle();
 
-        // Always cancel forwarding when the touch stream ends.
-        final int action = srcEvent.getActionMasked();
-        final boolean keepForwarding = action != MotionEvent.ACTION_UP
-                && action != MotionEvent.ACTION_CANCEL;
-
         return handled && keepForwarding;
     }