Update Android port

* doc/lispref/commands.texi (Touchscreen Events): Describe
treatment of canceled touch sequences during touch event
translation.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): Update JNI
prototypes.
* java/org/gnu/emacs/EmacsWindow.java (motionEvent): Set
cancelation flag in events sent where appropriate.
* lisp/touch-screen.el (touch-screen-handle-point-update):
Improve treatment of horizontal scrolling near window edges.
(touch-screen-handle-touch): Don't handle point up if the touch
sequence has been canceled.
* src/android.c (sendTouchDown, sendTouchUp, sendTouchMove): New
argument `flags'.
* src/androidgui.h (enum android_touch_event_flags): New enum.
(struct android_touch_event): New field `flags'.
* src/androidterm.c (handle_one_android_event): Report
cancelation in TOUCHSCREEN_END_EVENTs.
* src/keyboard.c (make_lispy_event): Fix botched merge.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 27800a61864..bcb6cd6db45 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -1511,6 +1511,11 @@ handle_one_android_event (struct android_display_info *dpyinfo,
               inev.ie.kind = TOUCHSCREEN_END_EVENT;
               inev.ie.timestamp = event->touch.time;
 
+              /* Report whether the sequence has been canceled.  */
+
+              if (event->touch.flags & ANDROID_TOUCH_SEQUENCE_CANCELED)
+                inev.ie.modifiers = 1;
+
               XSETFRAME (inev.ie.frame_or_window, any);
               XSETINT (inev.ie.x, event->touch.x);
               XSETINT (inev.ie.y, event->touch.y);