summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/MediaController.java
diff options
context:
space:
mode:
authorbxu10X <bxu10X@intel.com>2012-04-10 16:52:36 +0800
committerShuo Gao <shuo.gao@intel.com>2012-08-17 10:52:33 +0800
commit96ac720117979ab0507d8760f49076a0a1e3bfb8 (patch)
treee584ae5f6c9fd5c3feb74e727fc0525bdfd8ed11 /core/java/android/widget/MediaController.java
parenta950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9 (diff)
downloadframeworks_base-96ac720117979ab0507d8760f49076a0a1e3bfb8.zip
frameworks_base-96ac720117979ab0507d8760f49076a0a1e3bfb8.tar.gz
frameworks_base-96ac720117979ab0507d8760f49076a0a1e3bfb8.tar.bz2
[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
When long press camera key, dispatchKeyEvent function will add control surface after the control view hide, actually, we needn't show control view after we press camera key. Change-Id: I45175c4eb97b3f13469cd9d8bacb295c9c5803dd Author: Bin Xu <bxu10X@intel.com> Signed-off-by: Bin Xu <bxu10X@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 28344
Diffstat (limited to 'core/java/android/widget/MediaController.java')
-rw-r--r--core/java/android/widget/MediaController.java3
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) {