Update Android port

* doc/lispref/frames.texi (On-Screen Keyboards): Describe return
value of `frame-toggle-on-screen-keyboard'.
* java/org/gnu/emacs/EmacsSurfaceView.java (surfaceChanged)
(surfaceCreated, EmacsSurfaceView): Remove unuseful
synchronization code.  The framework doesn't seem to look at
this at all.

* java/org/gnu/emacs/EmacsView.java (EmacsView):
(onLayout): Lay out the window after children.
(swapBuffers): Properly implement `force'.
(windowUpdated): Delete function.

* lisp/frame.el (frame-toggle-on-screen-keyboard): Return
whether or not the on screen keyboard might've been displayed.

* lisp/minibuffer.el (minibuffer-on-screen-keyboard-timer):
(minibuffer-on-screen-keyboard-displayed):
(minibuffer-setup-on-screen-keyboard):
(minibuffer-exit-on-screen-keyboard): Improve OSK dismissal when
there are consecutive minibuffers.

* lisp/touch-screen.el (touch-screen-window-selection-changed):
New function.
(touch-screen-handle-point-up): Register it as a window
selection changed function.

* src/android.c (struct android_emacs_window)
(android_init_emacs_window): Remove references to
`windowUpdated'.
(android_window_updated): Delete function.
* src/android.h (struct android_output): Remove
`last_configure_serial'.
* src/androidterm.c (handle_one_android_event)
(android_frame_up_to_date):
* src/androidterm.h (struct android_output): Remove frame
synchronization, as that does not work on Android.

1 files changed, 0 insertions, 18 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index d5dafe9b0d7..4aee1a90b68 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -591,17 +591,7 @@ 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;
 
@@ -1352,14 +1342,6 @@ 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 ();