summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-04-08 11:27:55 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-04-08 11:27:55 -0700
commit529973acc25ba41e7d71ed58448ecee793bcc657 (patch)
tree229295aefabe8d17b5109d8d6707cb3d028b92a4 /include/ui
parentc01e71696136a5cd3668d37f267e227f568b8804 (diff)
parente5f56fb1b4fd681e0d9d9b3524c945c8dfe00daa (diff)
downloadframeworks_native-529973acc25ba41e7d71ed58448ecee793bcc657.zip
frameworks_native-529973acc25ba41e7d71ed58448ecee793bcc657.tar.gz
frameworks_native-529973acc25ba41e7d71ed58448ecee793bcc657.tar.bz2
merge from open-source master
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/KeycodeLabels.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h
index 571e47b..749155e 100644
--- a/include/ui/KeycodeLabels.h
+++ b/include/ui/KeycodeLabels.h
@@ -114,6 +114,8 @@ static const KeycodeLabel KEYCODES[] = {
{ "MEDIA_REWIND", 89 },
{ "MEDIA_FAST_FORWARD", 90 },
{ "MUTE", 91 },
+ { "PAGE_UP", 92 },
+ { "PAGE_DOWN", 93 },
// NOTE: If you add a new keycode here you must also add it to:
// (enum KeyCode, in this file)
@@ -218,7 +220,9 @@ typedef enum KeyCode {
kKeyCodePreviousSong = 88,
kKeyCodeRewind = 89,
kKeyCodeForward = 90,
- kKeyCodeMute = 91
+ kKeyCodeMute = 91,
+ kKeyCodePageUp = 92,
+ kKeyCodePageDown = 93
} KeyCode;
static const KeycodeLabel FLAGS[] = {