3 files changed, 25 insertions, 0 deletions

diff --git a/src/android.c b/src/android.c
index e39c34136de..79598ab86df 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2825,6 +2825,15 @@ NATIVE_NAME (sendExpose) (JNIEnv *env, jobject object,
   return event_serial;
 }
 
+JNIEXPORT jboolean JNICALL
+NATIVE_NAME (shouldForwardMultimediaButtons) (JNIEnv *env,
+                                              jobject object)
+{
+  /* Yes, android_pass_multimedia_buttons_to_system is being
+     read from the UI thread.  */
+  return !android_pass_multimedia_buttons_to_system;
+}
+
 /* Forward declarations of deadlock prevention functions.  */
 
 static void android_begin_query (void);
diff --git a/src/androidfns.c b/src/androidfns.c
index 589ae4331cb..e1d423ab3eb 100644
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -3075,6 +3075,17 @@ syms_of_androidfns (void)
     doc: /* SKIP: real doc in xfns.c.  */);
   Vx_max_tooltip_size = Qnil;
 
+  DEFVAR_BOOL ("android-pass-multimedia-buttons-to-system",
+               android_pass_multimedia_buttons_to_system,
+    doc: /* Whether or not to pass volume control buttons to the system.
+Generally, the `volume-up', `volume-down' and `volume-mute' keys are
+processed by Emacs, but setting this to non-nil they are passed to the
+operating system instead of being intercepted by Emacs.
+
+Note that if you set this, you will no longer be able to quit Emacs
+using the volume down button.  */);
+  android_pass_multimedia_buttons_to_system = false;
+
   /* Functions defined.  */
   defsubr (&Sx_create_frame);
   defsubr (&Sxw_color_defined_p);
diff --git a/src/keyboard.c b/src/keyboard.c
index a38c7394543..0a74b435f0e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4972,6 +4972,7 @@ const char *const lispy_function_keys[] =
     [111] = "escape",
     [112] = "delete",
     [121] = "break",
+    [120] = "sysrq",
     [122] = "home",
     [123] = "end",
     [124] = "insert",
@@ -4988,6 +4989,7 @@ const char *const lispy_function_keys[] =
     [141] = "f11",
     [142] = "f12",
     [160] = "kp-ret",
+    [164] = "volume-mute",
     [19]  = "up",
     [20]  = "down",
     [213] = "muhenkan",
@@ -4996,6 +4998,8 @@ const char *const lispy_function_keys[] =
     [218] = "kana",
     [21]  = "left",
     [22]  = "right",
+    [24]  = "volume-up",
+    [25]  = "volume-down",
     [259] = "help",
     [268] = "kp-up-left",
     [269] = "kp-down-left",
@@ -5010,6 +5014,7 @@ const char *const lispy_function_keys[] =
     [66]  = "return",
     [67]  = "backspace",
     [82]  = "menu",
+    [84]  = "find",
     [92]  = "prior",
     [93]  = "next",
   };