diff options
author | Chih-Chung Chang <chihchung@google.com> | 2011-09-28 21:07:19 +0800 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2011-09-28 21:07:19 +0800 |
commit | 5bf3bba0c72f1b7171ab60753385dbeb0628070e (patch) | |
tree | e07ba21ef4862d4862af895494d4453a6640de47 /src/com/android/gallery3d/app/MoviePlayer.java | |
parent | 399bb7eab79c9e48efb5b481a5f9dc2536ff45b4 (diff) | |
download | android_packages_apps_Snap-5bf3bba0c72f1b7171ab60753385dbeb0628070e.tar.gz android_packages_apps_Snap-5bf3bba0c72f1b7171ab60753385dbeb0628070e.tar.bz2 android_packages_apps_Snap-5bf3bba0c72f1b7171ab60753385dbeb0628070e.zip |
Fix 5384679: Back button doesn't work in Video Player
Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147
Diffstat (limited to 'src/com/android/gallery3d/app/MoviePlayer.java')
-rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 28 |
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(); |