Update Android port

* doc/emacs/android.texi (Android Windowing): Document how to
pass multimedia keys to the system.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function.
* java/org/gnu/emacs/EmacsView.java (onKeyDown, onKeyMultiple)
(onKeyUp): Check that function.
* java/org/gnu/emacs/EmacsWindow.java (defineCursor): Handle
cases where cursor is NULL.
* src/android.c (NATIVE_NAME): New function.
* src/androidfns.c (syms_of_androidfns): New variable.
* src/keyboard.c (lispy_function_keys): Add volume keys.

3 files changed, 26 insertions, 1 deletions

diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index d96c93a83a1..7d13ff99abb 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -174,6 +174,10 @@ public final class EmacsNative
      main thread's looper to respond.  */
   public static native void endSynchronous ();
 
+  /* Return whether or not KEYCODE_VOLUME_DOWN, KEYCODE_VOLUME_UP and
+     KEYCODE_VOLUME_MUTE should be forwarded to Emacs.  */
+  public static native boolean shouldForwardMultimediaButtons ();
+
 
 
   /* Input connection functions.  These mostly correspond to their
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 6ace609f386..878ef2f3fbf 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -361,6 +361,12 @@ public final class EmacsView extends ViewGroup
   public boolean
   onKeyDown (int keyCode, KeyEvent event)
   {
+    if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP
+         || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+         || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE)
+        && !EmacsNative.shouldForwardMultimediaButtons ())
+      return false;
+
     window.onKeyDown (keyCode, event);
     return true;
   }
@@ -369,6 +375,12 @@ public final class EmacsView extends ViewGroup
   public boolean
   onKeyMultiple (int keyCode, int repeatCount, KeyEvent event)
   {
+    if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP
+         || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+         || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE)
+        && !EmacsNative.shouldForwardMultimediaButtons ())
+      return false;
+
     window.onKeyDown (keyCode, event);
     return true;
   }
@@ -377,6 +389,12 @@ public final class EmacsView extends ViewGroup
   public boolean
   onKeyUp (int keyCode, KeyEvent event)
   {
+    if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP
+         || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+         || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE)
+        && !EmacsNative.shouldForwardMultimediaButtons ())
+      return false;
+
     window.onKeyUp (keyCode, event);
     return true;
   }
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index 6be609edcfe..d786c104153 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -1234,7 +1234,10 @@ public final class EmacsWindow extends EmacsHandleObject
           public void
           run ()
           {
-            view.setPointerIcon (cursor.icon);
+            if (cursor != null)
+              view.setPointerIcon (cursor.icon);
+            else
+              view.setPointerIcon (null);
           }
         });
   }