summaryrefslogtreecommitdiffstats
path: root/include
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
commit65369424cbfbf165b4324bdcb6f138435462a196 (patch)
tree8cf8a4dcd3f139386bb20d2a610cfc903a5cb0d9 /include
parent6b04d5c735df7fa05c705f979eff8821989ab73d (diff)
parent4fedd80c1d3997d62073518973b1fe09862ebaa5 (diff)
downloadframeworks_base-65369424cbfbf165b4324bdcb6f138435462a196.zip
frameworks_base-65369424cbfbf165b4324bdcb6f138435462a196.tar.gz
frameworks_base-65369424cbfbf165b4324bdcb6f138435462a196.tar.bz2
merge from open-source master
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
Diffstat (limited to 'include')
-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[] = {