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

diff --git a/src/androidterm.c b/src/androidterm.c
index 3c16b542d91..3024890d789 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -591,7 +591,17 @@ handle_one_android_event (struct android_display_info *dpyinfo,
           android_clear_under_internal_border (f);
           SET_FRAME_GARBAGED (f);
           cancel_mouse_face (f);
+
+          /* Now stash the serial of this configure event somewhere,
+             and call android_window_updated with it once the redraw
+             completes.  */
+          FRAME_OUTPUT_DATA (f)->last_configure_serial
+            = configureEvent.xconfigure.serial;
         }
+      else
+        /* Reply to this ConfigureNotify event immediately.  */
+        android_window_updated (FRAME_ANDROID_WINDOW (f),
+                                configureEvent.xconfigure.serial);
 
       goto OTHER;
 
@@ -1194,6 +1204,9 @@ handle_one_android_event (struct android_display_info *dpyinfo,
       /* Iconification.  This is vastly simpler than on X.  */
     case ANDROID_ICONIFIED:
 
+      if (!any)
+        goto OTHER;
+
       if (FRAME_ICONIFIED_P (any))
         goto OTHER;
 
@@ -1206,6 +1219,9 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
     case ANDROID_DEICONIFIED:
 
+      if (!any)
+        goto OTHER;
+
       if (!FRAME_ICONIFIED_P (any))
         goto OTHER;
 
@@ -1311,6 +1327,14 @@ android_frame_up_to_date (struct frame *f)
   /* The frame is now complete, as its contents have been drawn.  */
   FRAME_ANDROID_COMPLETE_P (f) = true;
 
+  /* If there was an outstanding configure event, then tell system
+     that the update has finished and the new contents can now be
+     displayed.  */
+  if (FRAME_OUTPUT_DATA (f)->last_configure_serial)
+    android_window_updated (FRAME_ANDROID_WINDOW (f),
+                            FRAME_OUTPUT_DATA (f)->last_configure_serial);
+  FRAME_OUTPUT_DATA (f)->last_configure_serial = 0;
+
   /* Shrink the scanline buffer used by the font backend.  */
   sfntfont_android_shrink_scanline_buffer ();
   unblock_input ();