diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-28 11:13:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-28 11:13:38 -0700 |
| commit | a3b63c001cfd04121708e2bd67af5c8eb855baa1 (patch) | |
| tree | f2d67f27822a93cc305bc9fc01e6ad1571b9d8cc | |
| parent | 70574efd8f7105eb73a6ffe31992ed3c5971c8cc (diff) | |
| parent | 337756fa6587bca84afdfdc964805f962ea534ed (diff) | |
| download | frameworks_base-a3b63c001cfd04121708e2bd67af5c8eb855baa1.zip frameworks_base-a3b63c001cfd04121708e2bd67af5c8eb855baa1.tar.gz frameworks_base-a3b63c001cfd04121708e2bd67af5c8eb855baa1.tar.bz2 | |
am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit '337756fa6587bca84afdfdc964805f962ea534ed':
[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
| -rw-r--r-- | core/java/android/widget/MediaController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index fc35f05..f76ab2b 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -477,7 +477,8 @@ public class MediaController extends FrameLayout { return true; } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_VOLUME_UP - || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) { + || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE + || keyCode == KeyEvent.KEYCODE_CAMERA) { // don't show the controls for volume adjustment return super.dispatchKeyEvent(event); } else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU) { |