Merge "Always cancel forwarding on ACTION_UP or ACTION_CANCEL." into ub-launcher3-calgary (278958e9) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/shortcuts/ShortcutsContainerListener.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}