PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tony Wickham
2016-08-02 18:10:00 +00:00
committed by Android (Google) Code Review
parent a42b283028 37a759a99c
commit 278958e922
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java
+5 -6
View File
@@ -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;
}