Update Android port

* .gitignore: Don't ignore verbose.mk.android.
* doc/emacs/Makefile.in (EMACSSOURCES): Add android.texi and
input.texi.
* doc/emacs/android.texi (Android): Document support for the
on-screen keyboard.
(Android Startup): Document how to start Emacs with -Q on
Android.
(Android Environment): Document how Emacs works around the
system ``task killer''.  Document changes to frame deletion
behavior.
* doc/emacs/emacs.texi (Top):
* doc/emacs/input.texi (Other Input Devices, On-Screen
Keyboards): Document how to use Emacs with virtual keyboards.
* doc/lispref/commands.texi (Touchscreen Events): Document
changes to `touch-screen-track-drag'.
* doc/lispref/frames.texi (Frames, On-Screen Keyboards): New
node.
* java/AndroidManifest.xml.in: Add settings activity and
appropriate OSK adjustment mode.
* java/org/gnu/emacs/EmacsActivity.java (onCreate): Allow
creating Emacs with -Q.
(onDestroy): Don't remove if killed by the system.
* java/org/gnu/emacs/EmacsContextMenu.java (inflateMenuItems):
Fix context menus again.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): Make all
event sending functions return long.
* java/org/gnu/emacs/EmacsPreferencesActivity.java
(EmacsPreferencesActivity): New class.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(onStartCommand, onCreate, startEmacsService): Start as a
foreground service if necessary to bypass system restrictions.
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView):
* java/org/gnu/emacs/EmacsThread.java (EmacsThread, run):
* java/org/gnu/emacs/EmacsView.java (EmacsView, onLayout)
(onDetachedFromWindow):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, viewLayout):
Implement frame resize synchronization..
* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(EmacsWindowAttachmentManager, removeWindowConsumer): Adjust
accordingly for changes to frame deletion behavior.
* lisp/frame.el (android-toggle-on-screen-keyboard)
(frame-toggle-on-screen-keyboard): New function.
* lisp/minibuffer.el (minibuffer-setup-on-screen-keyboard)
(minibuffer-exit-on-screen-keyboard): New functions.
(minibuffer-setup-hook, minibuffer-exit-hook): Add new functions
to hooks.

* lisp/touch-screen.el (touch-screen-relative-xy): Accept new
value of window `frame'.  Return frame coordinates in that case.
(touch-screen-set-point-commands): New variable.
(touch-screen-handle-point-up): Respect that variable.
(touch-screen-track-drag): Return `no-drag' where appropriate.
(touch-screen-drag-mode-line-1, touch-screen-drag-mode-line):
Refactor to use `no-drag'.

* src/android.c (struct android_emacs_window): New methods.
Make all event sending functions return the event serial.
(android_toggle_on_screen_keyboard, android_window_updated): New
functions.
* src/android.h: Update prototypes.
* src/androidfns.c (Fandroid_toggle_on_screen_keyboard)
(syms_of_androidfns): New function.
* src/androidgui.h (struct android_any_event)
(struct android_key_event, struct android_configure_event)
(struct android_focus_event, struct android_window_action_event)
(struct android_crossing_event, struct android_motion_event)
(struct android_button_event, struct android_touch_event)
(struct android_wheel_event, struct android_iconify_event)
(struct android_menu_event): Add `serial' fields.

* src/androidterm.c (handle_one_android_event)
(android_frame_up_to_date):
* src/androidterm.h (struct android_output): Implement frame
resize synchronization.

1 files changed, 20 insertions, 0 deletions

diff --git a/src/androidgui.h b/src/androidgui.h
index 1f28c18ff34..3b9a74dc0b0 100644
--- a/src/androidgui.h
+++ b/src/androidgui.h
@@ -239,6 +239,7 @@ enum android_event_type
 struct android_any_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
 };
 
@@ -252,6 +253,7 @@ enum android_modifier_mask
 struct android_key_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
   android_time time;
   unsigned int state;
@@ -271,6 +273,7 @@ struct android_key_event
 struct android_configure_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
   android_time time;
   int x, y;
@@ -280,6 +283,7 @@ struct android_configure_event
 struct android_focus_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
   android_time time;
 };
@@ -287,6 +291,7 @@ struct android_focus_event
 struct android_window_action_event
 {
   enum android_event_type type;
+  unsigned long serial;
 
   /* The window handle.  This can be ANDROID_NONE.  */
   android_window window;
@@ -301,6 +306,7 @@ struct android_window_action_event
 struct android_crossing_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
   int x, y;
   unsigned long time;
@@ -309,6 +315,7 @@ struct android_crossing_event
 struct android_motion_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
   int x, y;
   unsigned long time;
@@ -317,6 +324,7 @@ struct android_motion_event
 struct android_button_event
 {
   enum android_event_type type;
+  unsigned long serial;
   android_window window;
   int x, y;
   unsigned long time;
@@ -329,6 +337,9 @@ struct android_touch_event
   /* Type of the event.  */
   enum android_event_type type;
 
+  /* Serial identifying the event.  */
+  unsigned long serial;
+
   /* Window associated with the event.  */
   android_window window;
 
@@ -347,6 +358,9 @@ struct android_wheel_event
   /* Type of the event.  */
   enum android_event_type type;
 
+  /* Serial identifying the event.  */
+  unsigned long serial;
+
   /* Window associated with the event.  */
   android_window window;
 
@@ -368,6 +382,9 @@ struct android_iconify_event
   /* Type of the event.  */
   enum android_event_type type;
 
+  /* Serial identifying the event.  */
+  unsigned long serial;
+
   /* Window associated with the event.  */
   android_window window;
 };
@@ -377,6 +394,9 @@ struct android_menu_event
   /* Type of the event.  */
   enum android_event_type type;
 
+  /* Serial identifying the event.  */
+  unsigned long serial;
+
   /* Window associated with the event.  Always None.  */
   android_window window;