ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add a keycode to switch audio tracks (2/2)"

Browse Source
This commit is contained in:
michaelwr 2013-07-16 01:38:36 +00:00 committed by Android (Google) Code Review
commit 174c26045c
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/android/keycodes.h
View File

@ -265,6 +265,7 @@ enum {
AKEYCODE_ASSIST = 219, AKEYCODE_ASSIST = 219,
AKEYCODE_BRIGHTNESS_DOWN = 220, AKEYCODE_BRIGHTNESS_DOWN = 220,
AKEYCODE_BRIGHTNESS_UP = 221, AKEYCODE_BRIGHTNESS_UP = 221,
AKEYCODE_MEDIA_AUDIO_TRACK = 222,
// NOTE: If you add a new keycode here you must also add it to several other files. // NOTE: If you add a new keycode here you must also add it to several other files.
// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

1
include/input/KeycodeLabels.h
View File

@ -246,6 +246,7 @@ static const KeycodeLabel KEYCODES[] = {
{ "ASSIST", 219 }, { "ASSIST", 219 },
{ "BRIGHTNESS_DOWN", 220 }, { "BRIGHTNESS_DOWN", 220 },
{ "BRIGHTNESS_UP", 221 }, { "BRIGHTNESS_UP", 221 },
{ "MEDIA_AUDIO_TRACK", 222 },
// NOTE: If you add a new keycode here you must also add it to several other files. // NOTE: If you add a new keycode here you must also add it to several other files.
// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

2
libs/input/Input.cpp
View File

@ -70,6 +70,7 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) {
case AKEYCODE_MUTE: case AKEYCODE_MUTE:
case AKEYCODE_BRIGHTNESS_DOWN: case AKEYCODE_BRIGHTNESS_DOWN:
case AKEYCODE_BRIGHTNESS_UP: case AKEYCODE_BRIGHTNESS_UP:
case AKEYCODE_MEDIA_AUDIO_TRACK:
return true; return true;
} }
@ -108,6 +109,7 @@ bool KeyEvent::isSystemKey(int32_t keyCode) {
case AKEYCODE_SEARCH: case AKEYCODE_SEARCH:
case AKEYCODE_BRIGHTNESS_DOWN: case AKEYCODE_BRIGHTNESS_DOWN:
case AKEYCODE_BRIGHTNESS_UP: case AKEYCODE_BRIGHTNESS_UP:
case AKEYCODE_MEDIA_AUDIO_TRACK:
return true; return true;
} }