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, 10 insertions, 0 deletions

diff --git a/src/androidgui.h b/src/androidgui.h
index 9e604cdcb8c..265ec29b678 100644
--- a/src/androidgui.h
+++ b/src/androidgui.h
@@ -365,6 +365,13 @@ struct android_expose_event
   int width, height;
 };
 
+enum android_touch_event_flags
+  {
+    /* This touch sequence has been intercepted by the WM (probably
+       for back gesture navigation or some such.)  */
+    ANDROID_TOUCH_SEQUENCE_CANCELED = 1,
+  };
+
 struct android_touch_event
 {
   /* Type of the event.  */
@@ -384,6 +391,9 @@ struct android_touch_event
 
   /* Index of the pointer being tracked.  */
   unsigned int pointer_id;
+
+  /* Flags associated with this event.  */
+  int flags;
 };
 
 struct android_wheel_event