diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-11-02 17:38:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-02 17:38:18 -0700 |
| commit | 5ffcd088cef3fdf3cebb674e47cd1aa739fde630 (patch) | |
| tree | def11bfa9027807caf05affbeda90f89dcb84db4 /libs/ui | |
| parent | d4bb9b3789bb7bcba25b392aa330326f530c7dc8 (diff) | |
| parent | b0418da0e7594a8c2164a46985c5f1993632e010 (diff) | |
| download | frameworks_base-5ffcd088cef3fdf3cebb674e47cd1aa739fde630.zip frameworks_base-5ffcd088cef3fdf3cebb674e47cd1aa739fde630.tar.gz frameworks_base-5ffcd088cef3fdf3cebb674e47cd1aa739fde630.tar.bz2 | |
Merge "Add plumbing for volume mute key."
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/Input.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libs/ui/Input.cpp b/libs/ui/Input.cpp index 811edaf..944a79b 100644 --- a/libs/ui/Input.cpp +++ b/libs/ui/Input.cpp @@ -33,6 +33,7 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) { case AKEYCODE_ENDCALL: case AKEYCODE_VOLUME_UP: case AKEYCODE_VOLUME_DOWN: + case AKEYCODE_VOLUME_MUTE: case AKEYCODE_POWER: case AKEYCODE_CAMERA: case AKEYCODE_HEADSETHOOK: @@ -40,11 +41,14 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) { case AKEYCODE_NOTIFICATION: case AKEYCODE_FOCUS: case AKEYCODE_SEARCH: + case AKEYCODE_MEDIA_PLAY: + case AKEYCODE_MEDIA_PAUSE: case AKEYCODE_MEDIA_PLAY_PAUSE: case AKEYCODE_MEDIA_STOP: case AKEYCODE_MEDIA_NEXT: case AKEYCODE_MEDIA_PREVIOUS: case AKEYCODE_MEDIA_REWIND: + case AKEYCODE_MEDIA_RECORD: case AKEYCODE_MEDIA_FAST_FORWARD: case AKEYCODE_MUTE: return true; @@ -67,14 +71,18 @@ bool KeyEvent::isSystemKey(int32_t keyCode) { case AKEYCODE_ENDCALL: case AKEYCODE_VOLUME_UP: case AKEYCODE_VOLUME_DOWN: + case AKEYCODE_VOLUME_MUTE: case AKEYCODE_MUTE: case AKEYCODE_POWER: case AKEYCODE_HEADSETHOOK: + case AKEYCODE_MEDIA_PLAY: + case AKEYCODE_MEDIA_PAUSE: case AKEYCODE_MEDIA_PLAY_PAUSE: case AKEYCODE_MEDIA_STOP: case AKEYCODE_MEDIA_NEXT: case AKEYCODE_MEDIA_PREVIOUS: case AKEYCODE_MEDIA_REWIND: + case AKEYCODE_MEDIA_RECORD: case AKEYCODE_MEDIA_FAST_FORWARD: case AKEYCODE_CAMERA: case AKEYCODE_FOCUS: |