summaryrefslogtreecommitdiffstats
path: root/libs/input
diff options
context:
space:
mode:
authormichaelwr <michaelwr@google.com>2013-07-16 01:38:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-16 01:38:36 +0000
commit174c26045c79c56acbd95f1644a72ca512c75134 (patch)
tree02e1f810fd9e21f29b6645d0a3ab3b73b2b734ef /libs/input
parent0fd3bf46523b24e2a2089f75caef08ea0018ea07 (diff)
parent8d06dcf9c663cccc44318c01c13f2b3ba0001b4c (diff)
downloadframeworks_native-174c26045c79c56acbd95f1644a72ca512c75134.zip
frameworks_native-174c26045c79c56acbd95f1644a72ca512c75134.tar.gz
frameworks_native-174c26045c79c56acbd95f1644a72ca512c75134.tar.bz2
Merge "Add a keycode to switch audio tracks (2/2)"
Diffstat (limited to 'libs/input')
-rw-r--r--libs/input/Input.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index fd33ffc..6f53996 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -70,6 +70,7 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) {
case AKEYCODE_MUTE:
case AKEYCODE_BRIGHTNESS_DOWN:
case AKEYCODE_BRIGHTNESS_UP:
+ case AKEYCODE_MEDIA_AUDIO_TRACK:
return true;
}
@@ -108,6 +109,7 @@ bool KeyEvent::isSystemKey(int32_t keyCode) {
case AKEYCODE_SEARCH:
case AKEYCODE_BRIGHTNESS_DOWN:
case AKEYCODE_BRIGHTNESS_UP:
+ case AKEYCODE_MEDIA_AUDIO_TRACK:
return true;
}