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.

java/org/gnu/emacs/EmacsView.java

@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 package org.gnu.emacs;
 
+import android.content.Context;
 import android.content.res.ColorStateList;
 
 import android.view.ContextMenu;
@@ -27,6 +28,8 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
 
+import android.view.inputmethod.InputMethodManager;
+
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -86,11 +89,23 @@ public class EmacsView extends ViewGroup
   /* The serial of the last clip rectangle change.  */
   private long lastClipSerial;
 
+  /* The InputMethodManager for this view's context.  */
+  private InputMethodManager imManager;
+
+  /* Runnable that will run once drawing completes.  */
+  public Runnable drawingFinished;
+
+  /* Serial of the last ConfigureNotify event sent that Emacs has not
+     yet responded to.  0 if there is no such outstanding event.  */
+  public long pendingConfigure;
+
   public
   EmacsView (EmacsWindow window)
   {
     super (EmacsService.SERVICE);
 
+    Object tem;
+
     this.window = window;
     this.damageRegion = new Region ();
     this.paint = new Paint ();
@@ -111,6 +126,10 @@ public class EmacsView extends ViewGroup
     /* Get rid of the default focus highlight.  */
     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O)
       setDefaultFocusHighlightEnabled (false);
+
+    /* Obtain the input method manager.  */
+    tem = getContext ().getSystemService (Context.INPUT_METHOD_SERVICE);
+    imManager = (InputMethodManager) tem;
   }
 
   private void
@@ -259,7 +278,8 @@ public class EmacsView extends ViewGroup
     if (changed || mustReportLayout)
       {
 	mustReportLayout = false;
-	window.viewLayout (left, top, right, bottom);
+	pendingConfigure
+	  = window.viewLayout (left, top, right, bottom);
       }
 
     measuredWidth = right - left;
@@ -538,4 +558,37 @@ public class EmacsView extends ViewGroup
 	Runtime.getRuntime ().gc ();
       }
   }
+
+  public void
+  showOnScreenKeyboard ()
+  {
+    /* Specifying no flags at all tells the system the user asked for
+       the input method to be displayed.  */
+    imManager.showSoftInput (this, 0);
+  }
+
+  public void
+  hideOnScreenKeyboard ()
+  {
+    imManager.hideSoftInputFromWindow (this.getWindowToken (),
+				       0);
+  }
+
+  public void
+  windowUpdated (long serial)
+  {
+    Log.d (TAG, "windowUpdated: serial is " + serial);
+
+    if (pendingConfigure <= serial
+	/* Detect wraparound.  */
+	|| pendingConfigure - serial >= 0x7fffffff)
+      {
+	pendingConfigure = 0;
+
+	if (drawingFinished != null)
+	  drawingFinished.run ();
+
+	drawingFinished = null;
+      }
+  }
 };