From e035e4de7f12e5fb1124dbcca12d5a47a708d778 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 28 Sep 2015 12:25:05 +0100
Subject: [PATCH] Let MediaController handle whatever keys it wants to handle.

....Except BACK and MENU, which only make sense if the the controller
is visible.
---
 .../com/google/android/exoplayer/demo/PlayerActivity.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
index 765aaffdb2..1d763318cb 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
@@ -150,10 +150,10 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
     root.setOnKeyListener(new OnKeyListener() {
       @Override
       public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
-          return mediaController.dispatchKeyEvent(event);
+        if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU) {
+          return false;
         }
-        return false;
+        return mediaController.dispatchKeyEvent(event);
       }
     });