Update Android port

* doc/emacs/android.texi (Android Windowing): Reword
documentation.
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu):
* java/org/gnu/emacs/EmacsFontDriver.java (EmacsFontDriver):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsService.java (queryBattery):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): Make
functions final and classes static where necessary.
* src/android.c (struct android_emacs_service): New method
`display_toast'.
(android_init_emacs_service): Load new method.
(android_display_toast): New function.
* src/android.h: Export.
* src/androidfns.c (Fandroid_detect_mouse):
* src/androidselect.c (Fandroid_clipboard_owner_p)
(Fandroid_set_clipboard, Fandroid_get_clipboard)
(Fandroid_browse_url): Prevent crashes when called from
libandroid-emacs.so.
* src/androidterm.c (handle_one_android_event): Fix out of date
commentary.

1 files changed, 28 insertions, 0 deletions

diff --git a/src/android.c b/src/android.c
index 3bccaab041a..daeb7ab70f6 100644
--- a/src/android.c
+++ b/src/android.c
@@ -112,6 +112,7 @@ struct android_emacs_service
   jmethodID open_content_uri;
   jmethodID check_content_uri;
   jmethodID query_battery;
+  jmethodID display_toast;
 };
 
 struct android_emacs_pixmap
@@ -2124,6 +2125,8 @@ android_init_emacs_service (void)
   FIND_METHOD (check_content_uri, "checkContentUri",
                "([BZZ)Z");
   FIND_METHOD (query_battery, "queryBattery", "()[J");
+  FIND_METHOD (display_toast, "displayToast",
+               "(Ljava/lang/String;)V");
 #undef FIND_METHOD
 }
 
@@ -5696,6 +5699,31 @@ android_query_battery (struct android_battery_state *status)
   return 0;
 }
 
+/* Display a small momentary notification on screen containing
+   TEXT, which must be in the modified UTF encoding used by the
+   JVM.  */
+
+void
+android_display_toast (const char *text)
+{
+  jstring string;
+
+  /* Make the string.  */
+  string = (*android_java_env)->NewStringUTF (android_java_env,
+                                              text);
+  android_exception_check ();
+
+  /* Display the toast.  */
+  (*android_java_env)->CallVoidMethod (android_java_env,
+                                       emacs_service,
+                                       service_class.display_toast,
+                                       string);
+  android_exception_check_1 (string);
+
+  /* Delete the local reference to the string.  */
+  ANDROID_DELETE_LOCAL_REF (string);
+}
+
 
 
 /* Whether or not a query is currently being made.  */