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.

6 files changed, 193 insertions, 30 deletions

diff --git a/src/android.c b/src/android.c
index eb9c404f1a3..43ac3b3f754 100644
--- a/src/android.c
+++ b/src/android.c
@@ -121,6 +121,8 @@ struct android_emacs_window
 {
   jclass class;
   jmethodID swap_buffers;
+  jmethodID toggle_on_screen_keyboard;
+  jmethodID window_updated;
 };
 
 /* The asset manager being used.  */
@@ -193,6 +195,10 @@ static struct android_emacs_drawable drawable_class;
 /* Various methods associated with the EmacsWindow class.  */
 static struct android_emacs_window window_class;
 
+/* The last event serial used.  This is a 32 bit value, but it is
+   stored in unsigned long to be consistent with X.  */
+static unsigned int event_serial;
+
 
 
 /* Event handling functions.  Events are stored on a (circular) queue
@@ -1435,6 +1441,9 @@ android_init_emacs_window (void)
   assert (window_class.c_name);
 
   FIND_METHOD (swap_buffers, "swapBuffers", "()V");
+  FIND_METHOD (toggle_on_screen_keyboard,
+               "toggleOnScreenKeyboard", "(Z)V");
+  FIND_METHOD (window_updated, "windowUpdated", "(J)V");
 #undef FIND_METHOD
 }
 
@@ -1497,7 +1506,7 @@ NATIVE_NAME (emacsAbort) (JNIEnv *env, jobject object)
   emacs_abort ();
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendConfigureNotify) (JNIEnv *env, jobject object,
                                    jshort window, jlong time,
                                    jint x, jint y, jint width,
@@ -1506,6 +1515,7 @@ NATIVE_NAME (sendConfigureNotify) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xconfigure.type = ANDROID_CONFIGURE_NOTIFY;
+  event.xconfigure.serial = ++event_serial;
   event.xconfigure.window = window;
   event.xconfigure.time = time;
   event.xconfigure.x = x;
@@ -1514,9 +1524,10 @@ NATIVE_NAME (sendConfigureNotify) (JNIEnv *env, jobject object,
   event.xconfigure.height = height;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendKeyPress) (JNIEnv *env, jobject object,
                             jshort window, jlong time,
                             jint state, jint keycode,
@@ -1525,6 +1536,7 @@ NATIVE_NAME (sendKeyPress) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xkey.type = ANDROID_KEY_PRESS;
+  event.xkey.serial = ++event_serial;
   event.xkey.window = window;
   event.xkey.time = time;
   event.xkey.state = state;
@@ -1532,9 +1544,10 @@ NATIVE_NAME (sendKeyPress) (JNIEnv *env, jobject object,
   event.xkey.unicode_char = unicode_char;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendKeyRelease) (JNIEnv *env, jobject object,
                               jshort window, jlong time,
                               jint state, jint keycode,
@@ -1543,6 +1556,7 @@ NATIVE_NAME (sendKeyRelease) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xkey.type = ANDROID_KEY_RELEASE;
+  event.xkey.serial = ++event_serial;
   event.xkey.window = window;
   event.xkey.time = time;
   event.xkey.state = state;
@@ -1550,48 +1564,55 @@ NATIVE_NAME (sendKeyRelease) (JNIEnv *env, jobject object,
   event.xkey.unicode_char = unicode_char;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendFocusIn) (JNIEnv *env, jobject object,
                            jshort window, jlong time)
 {
   union android_event event;
 
-  event.xkey.type = ANDROID_FOCUS_IN;
-  event.xkey.window = window;
-  event.xkey.time = time;
+  event.xfocus.type = ANDROID_FOCUS_IN;
+  event.xfocus.serial = ++event_serial;
+  event.xfocus.window = window;
+  event.xfocus.time = time;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendFocusOut) (JNIEnv *env, jobject object,
                             jshort window, jlong time)
 {
   union android_event event;
 
-  event.xkey.type = ANDROID_FOCUS_OUT;
-  event.xkey.window = window;
-  event.xkey.time = time;
+  event.xfocus.type = ANDROID_FOCUS_OUT;
+  event.xfocus.serial = ++event_serial;
+  event.xfocus.window = window;
+  event.xfocus.time = time;
 
   android_write_event (&event);
+  return ++event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendWindowAction) (JNIEnv *env, jobject object,
                                 jshort window, jint action)
 {
   union android_event event;
 
   event.xaction.type = ANDROID_WINDOW_ACTION;
+  event.xaction.serial = ++event_serial;
   event.xaction.window = window;
   event.xaction.action = action;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendEnterNotify) (JNIEnv *env, jobject object,
                                jshort window, jint x, jint y,
                                jlong time)
@@ -1599,15 +1620,17 @@ NATIVE_NAME (sendEnterNotify) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xcrossing.type = ANDROID_ENTER_NOTIFY;
+  event.xcrossing.serial = ++event_serial;
   event.xcrossing.window = window;
   event.xcrossing.x = x;
   event.xcrossing.y = y;
   event.xcrossing.time = time;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendLeaveNotify) (JNIEnv *env, jobject object,
                                jshort window, jint x, jint y,
                                jlong time)
@@ -1615,15 +1638,17 @@ NATIVE_NAME (sendLeaveNotify) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xcrossing.type = ANDROID_LEAVE_NOTIFY;
+  event.xcrossing.serial = ++event_serial;
   event.xcrossing.window = window;
   event.xcrossing.x = x;
   event.xcrossing.y = y;
   event.xcrossing.time = time;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendMotionNotify) (JNIEnv *env, jobject object,
                                 jshort window, jint x, jint y,
                                 jlong time)
@@ -1631,15 +1656,17 @@ NATIVE_NAME (sendMotionNotify) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xmotion.type = ANDROID_MOTION_NOTIFY;
+  event.xmotion.serial = ++event_serial;
   event.xmotion.window = window;
   event.xmotion.x = x;
   event.xmotion.y = y;
   event.xmotion.time = time;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendButtonPress) (JNIEnv *env, jobject object,
                                jshort window, jint x, jint y,
                                jlong time, jint state,
@@ -1648,6 +1675,7 @@ NATIVE_NAME (sendButtonPress) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xbutton.type = ANDROID_BUTTON_PRESS;
+  event.xbutton.serial = ++event_serial;
   event.xbutton.window = window;
   event.xbutton.x = x;
   event.xbutton.y = y;
@@ -1656,9 +1684,10 @@ NATIVE_NAME (sendButtonPress) (JNIEnv *env, jobject object,
   event.xbutton.button = button;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendButtonRelease) (JNIEnv *env, jobject object,
                                  jshort window, jint x, jint y,
                                  jlong time, jint state,
@@ -1667,6 +1696,7 @@ NATIVE_NAME (sendButtonRelease) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.xbutton.type = ANDROID_BUTTON_RELEASE;
+  event.xbutton.serial = ++event_serial;
   event.xbutton.window = window;
   event.xbutton.x = x;
   event.xbutton.y = y;
@@ -1675,9 +1705,10 @@ NATIVE_NAME (sendButtonRelease) (JNIEnv *env, jobject object,
   event.xbutton.button = button;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
                              jshort window, jint x, jint y,
                              jlong time, jint pointer_id)
@@ -1685,6 +1716,7 @@ NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.touch.type = ANDROID_TOUCH_DOWN;
+  event.touch.serial = ++event_serial;
   event.touch.window = window;
   event.touch.x = x;
   event.touch.y = y;
@@ -1692,9 +1724,10 @@ NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
   event.touch.pointer_id = pointer_id;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
                            jshort window, jint x, jint y,
                            jlong time, jint pointer_id)
@@ -1702,6 +1735,7 @@ NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.touch.type = ANDROID_TOUCH_UP;
+  event.touch.serial = ++event_serial;
   event.touch.window = window;
   event.touch.x = x;
   event.touch.y = y;
@@ -1709,9 +1743,10 @@ NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
   event.touch.pointer_id = pointer_id;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
                              jshort window, jint x, jint y,
                              jlong time, jint pointer_id)
@@ -1719,6 +1754,7 @@ NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.touch.type = ANDROID_TOUCH_MOVE;
+  event.touch.serial = ++event_serial;
   event.touch.window = window;
   event.touch.x = x;
   event.touch.y = y;
@@ -1726,9 +1762,10 @@ NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
   event.touch.pointer_id = pointer_id;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendWheel) (JNIEnv *env, jobject object,
                          jshort window, jint x, jint y,
                          jlong time, jint state,
@@ -1737,6 +1774,7 @@ NATIVE_NAME (sendWheel) (JNIEnv *env, jobject object,
   union android_event event;
 
   event.wheel.type = ANDROID_WHEEL;
+  event.wheel.serial = ++event_serial;
   event.wheel.window = window;
   event.wheel.x = x;
   event.wheel.y = y;
@@ -1746,43 +1784,50 @@ NATIVE_NAME (sendWheel) (JNIEnv *env, jobject object,
   event.wheel.y_delta = y_delta;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendIconified) (JNIEnv *env, jobject object,
                              jshort window)
 {
   union android_event event;
 
   event.iconified.type = ANDROID_ICONIFIED;
+  event.iconified.serial = ++event_serial;
   event.iconified.window = window;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendDeiconified) (JNIEnv *env, jobject object,
                                jshort window)
 {
   union android_event event;
 
   event.iconified.type = ANDROID_DEICONIFIED;
+  event.iconified.serial = ++event_serial;
   event.iconified.window = window;
 
   android_write_event (&event);
+  return event_serial;
 }
 
-extern JNIEXPORT void JNICALL
+extern JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendContextMenu) (JNIEnv *env, jobject object,
                                jshort window, jint menu_event_id)
 {
   union android_event event;
 
   event.menu.type = ANDROID_CONTEXT_MENU;
+  event.menu.serial = ++event_serial;
   event.menu.window = window;
   event.menu.menu_event_id = menu_event_id;
 
   android_write_event (&event);
+  return event_serial;
 }
 
 #ifdef __clang__
@@ -3599,6 +3644,15 @@ android_translate_coordinates (android_window src, int x,
   ANDROID_DELETE_LOCAL_REF (coordinates);
 }
 
+void
+android_sync (void)
+{
+  (*android_java_env)->CallVoidMethod (android_java_env,
+                                       emacs_service,
+                                       service_class.sync);
+  android_exception_check ();
+}
+
 
 
 /* Low level drawing primitives.  */
@@ -3795,12 +3849,45 @@ android_get_keysym_name (int keysym, char *name_return, size_t size)
   ANDROID_DELETE_LOCAL_REF (string);
 }
 
+/* Display the on screen keyboard on window WINDOW, or hide it if SHOW
+   is false.  Ask the system to bring up or hide the on-screen
+   keyboard on behalf of WINDOW.  The request may be rejected by the
+   system, especially when the window does not have the input
+   focus.  */
+
 void
-android_sync (void)
+android_toggle_on_screen_keyboard (android_window window, bool show)
 {
-  (*android_java_env)->CallVoidMethod (android_java_env,
-                                       emacs_service,
-                                       service_class.sync);
+  jobject object;
+  jmethodID method;
+
+  object = android_resolve_handle (window, ANDROID_HANDLE_WINDOW);
+  method = window_class.toggle_on_screen_keyboard;
+
+  /* Now display the on screen keyboard.  */
+  (*android_java_env)->CallVoidMethod (android_java_env, object,
+                                       method, (jboolean) show);
+
+  /* Check for out of memory errors.  */
+  android_exception_check ();
+}
+
+/* Tell the window system that all configure events sent to WINDOW
+   have been fully processed, and that it is now okay to display its
+   new contents.  SERIAL is the serial of the last configure event
+   processed.  */
+
+void
+android_window_updated (android_window window, unsigned long serial)
+{
+  jobject object;
+  jmethodID method;
+
+  object = android_resolve_handle (window, ANDROID_HANDLE_WINDOW);
+  method = window_class.window_updated;
+
+  (*android_java_env)->CallVoidMethod (android_java_env, object,
+                                       method, (jlong) serial);
   android_exception_check ();
 }
 
@@ -3811,7 +3898,7 @@ android_sync (void)
 #undef faccessat
 
 /* Replace the system faccessat with one which understands AT_EACCESS.
-   Android's faccessat simply fails upon using AT_EACCESS, so repalce
+   Android's faccessat simply fails upon using AT_EACCESS, so replace
    it with zero here.  This isn't caught during configuration.
 
    This replacement is only done when building for Android 17 or
@@ -3829,7 +3916,7 @@ faccessat (int dirfd, const char *pathname, int mode, int flags)
   return real_faccessat (dirfd, pathname, mode, flags & ~AT_EACCESS);
 }
 
-#endif /* __ANDROID_API__ < 16 */
+#endif /* __ANDROID_API__ >= 17 */
 
 
 
diff --git a/src/android.h b/src/android.h
index 240bc90d831..97818ab4911 100644
--- a/src/android.h
+++ b/src/android.h
@@ -91,6 +91,8 @@ extern void android_exception_check (void);
 
 extern void android_get_keysym_name (int, char *, size_t);
 extern void android_wait_event (void);
+extern void android_toggle_on_screen_keyboard (android_window, bool);
+extern void android_window_updated (android_window, unsigned long);
 
 
 
diff --git a/src/androidfns.c b/src/androidfns.c
index bb37c415069..77ee2e8de44 100644
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -2332,6 +2332,30 @@ there is no mouse.  */)
 #endif
 }
 
+DEFUN ("android-toggle-on-screen-keyboard",
+       Fandroid_toggle_on_screen_keyboard,
+       Sandroid_toggle_on_screen_keyboard, 2, 2, 0,
+       doc: /* Display or hide the on-screen keyboard.
+If HIDE is non-nil, hide the on screen keyboard if it is currently
+being displayed.  Else, request that the system display it on behalf
+of FRAME.  This request may be rejected if FRAME does not have the
+input focus.  */)
+  (Lisp_Object frame, Lisp_Object hide)
+{
+#ifndef ANDROID_STUBIFY
+  struct frame *f;
+
+  f = decode_window_system_frame (frame);
+
+  block_input ();
+  android_toggle_on_screen_keyboard (FRAME_ANDROID_WINDOW (f),
+                                     NILP (hide));
+  unblock_input ();
+#endif
+
+  return Qnil;
+}
+
 
 
 #ifndef ANDROID_STUBIFY
@@ -2781,6 +2805,7 @@ syms_of_androidfns (void)
   defsubr (&Sx_show_tip);
   defsubr (&Sx_hide_tip);
   defsubr (&Sandroid_detect_mouse);
+  defsubr (&Sandroid_toggle_on_screen_keyboard);
 
 #ifndef ANDROID_STUBIFY
   tip_timer = Qnil;
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;
 
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 ();
diff --git a/src/androidterm.h b/src/androidterm.h
index c0f862e35fb..11b24d40b73 100644
--- a/src/androidterm.h
+++ b/src/androidterm.h
@@ -241,6 +241,11 @@ struct android_output
   /* List of all tools (either styluses or fingers) pressed onto the
      frame.  */
   struct android_touch_point *touch_points;
+
+  /* Event serial of the last ConfigureNotify event received that has
+     not yet been drawn.  This is used to synchronize resize with the
+     window system.  0 if no such outstanding event exists.  */
+  unsigned long last_configure_serial;
 };
 
 enum