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, 9 insertions, 3 deletions

diff --git a/src/android.c b/src/android.c
index 90288737c77..f2e5e75d35e 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2870,7 +2870,8 @@ NATIVE_NAME (sendButtonRelease) (JNIEnv *env, jobject object,
 JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
                              jshort window, jint x, jint y,
-                             jlong time, jint pointer_id)
+                             jlong time, jint pointer_id,
+                             jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -2883,6 +2884,7 @@ NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
   event.touch.y = y;
   event.touch.time = time;
   event.touch.pointer_id = pointer_id;
+  event.touch.flags = flags;
 
   android_write_event (&event);
   return event_serial;
@@ -2891,7 +2893,8 @@ NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
 JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
                            jshort window, jint x, jint y,
-                           jlong time, jint pointer_id)
+                           jlong time, jint pointer_id,
+                           jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -2904,6 +2907,7 @@ NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
   event.touch.y = y;
   event.touch.time = time;
   event.touch.pointer_id = pointer_id;
+  event.touch.flags = flags;
 
   android_write_event (&event);
   return event_serial;
@@ -2912,7 +2916,8 @@ NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
 JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
                              jshort window, jint x, jint y,
-                             jlong time, jint pointer_id)
+                             jlong time, jint pointer_id,
+                             jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -2925,6 +2930,7 @@ NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
   event.touch.y = y;
   event.touch.time = time;
   event.touch.pointer_id = pointer_id;
+  event.touch.flags = flags;
 
   android_write_event (&event);
   return event_serial;