summaryrefslogtreecommitdiffstats
path: root/include/input
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-08-07 18:12:20 +0100
committerMichael Wright <michaelwr@google.com>2015-08-07 18:12:20 +0100
commit1362ec74fc4f1dc223c9c322f8f49c966ba67594 (patch)
tree17deec99b25f59a7832bcb2c57babf6c78750648 /include/input
parent50be1df76e2c84fc3c893ec3d3e51ba427dd3ee6 (diff)
parent62ec2dd563eb9f537d76e6bb9c13d630f5ab01dc (diff)
downloadframeworks_native-1362ec74fc4f1dc223c9c322f8f49c966ba67594.zip
frameworks_native-1362ec74fc4f1dc223c9c322f8f49c966ba67594.tar.gz
frameworks_native-1362ec74fc4f1dc223c9c322f8f49c966ba67594.tar.bz2
Merge commit '62ec2dd5' into mm
Change-Id: I34801df36735545fc500486209573ed2864a0430
Diffstat (limited to 'include/input')
-rw-r--r--include/input/InputEventLabels.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index a38de00..344f2f3 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -307,6 +307,10 @@ static const InputEventLabel KEYCODES[] = {
DEFINE_KEYCODE(STEM_1),
DEFINE_KEYCODE(STEM_2),
DEFINE_KEYCODE(STEM_3),
+ DEFINE_KEYCODE(MEDIA_SKIP_FORWARD),
+ DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD),
+ DEFINE_KEYCODE(MEDIA_STEP_FORWARD),
+ DEFINE_KEYCODE(MEDIA_STEP_BACKWARD),
{ NULL, 0 }
};