diff options
author | Tony Wickham <twickham@google.com> | 2016-08-01 13:06:40 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-08-01 13:06:40 -0700 |
commit | 37a759a99cb40bbad87e7ee2f16d16055026444a (patch) | |
tree | 40d5cd25dc5e00001cfb6784b71c98c6bb6fcda5 /src/com/android/launcher3/shortcuts | |
parent | 0843675e939088d7974616f442ab8cad03f286e3 (diff) | |
download | android_packages_apps_Trebuchet-37a759a99cb40bbad87e7ee2f16d16055026444a.tar.gz android_packages_apps_Trebuchet-37a759a99cb40bbad87e7ee2f16d16055026444a.tar.bz2 android_packages_apps_Trebuchet-37a759a99cb40bbad87e7ee2f16d16055026444a.zip |
Always cancel forwarding on ACTION_UP or ACTION_CANCEL.
Bug: 30563284
Change-Id: I6285eda6d9f7a775f8ae896baebc420a0cf84e21
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
-rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java | 11 |
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; } |