Fix 5384679: Back button doesn't work in Video Player

Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147

1 files changed, 16 insertions, 12 deletions

diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 62b85b852..f37bc7d27 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -123,6 +123,22 @@ public class MoviePlayer implements
                 mActionBar.hide();
                 showSystemUi(false);
             }
+
+            // We intercept the "back" key events here, so hide() won't be
+            // called for ACTION_DOWN events of the "back" key (The code is in
+            // MediaController). Otherwise after system bar is hidden, we
+            // will not receive the ACTION_UP events of the "back" key.
+            @Override
+            public boolean dispatchKeyEvent(KeyEvent event) {
+                int keyCode = event.getKeyCode();
+                if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    if (event.getAction() == KeyEvent.ACTION_UP) {
+                        movieActivity.onBackPressed();
+                    }
+                    return true;
+                }
+                return super.dispatchKeyEvent(event);
+            }
         };
 
         mMediaController.show();
@@ -139,18 +155,6 @@ public class MoviePlayer implements
             }
         });
 
-        mMediaController.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_BACK) {
-                    if (event.getAction() == KeyEvent.ACTION_UP) {
-                        movieActivity.onBackPressed();
-                    }
-                    return true;
-                }
-                return false;
-            }
-        });
         mVideoView.setMediaController(mMediaController);
 
         mAudioBecomingNoisyReceiver = new AudioBecomingNoisyReceiver();