summaryrefslogtreecommitdiffstats
path: root/include/input
diff options
context:
space:
mode:
authorWally Yau <wyau@google.com>2014-09-03 17:37:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-03 17:37:02 +0000
commit3aa066e9d7480f0be806ac2d9f92bbb22771477b (patch)
tree3627840058dd3a28d3f588fc74dff5c5987d0bdb /include/input
parent4a29a80fff163a86959be2e3eb0f4a9d739b5f7d (diff)
parent19f8b79f154b64c664e974f7be067d456c3d57e2 (diff)
downloadframeworks_native-3aa066e9d7480f0be806ac2d9f92bbb22771477b.zip
frameworks_native-3aa066e9d7480f0be806ac2d9f92bbb22771477b.tar.gz
frameworks_native-3aa066e9d7480f0be806ac2d9f92bbb22771477b.tar.bz2
am 19f8b79f: Merge "New keycode definitions for TV remotes." into lmp-dev
* commit '19f8b79f154b64c664e974f7be067d456c3d57e2': New keycode definitions for TV remotes.
Diffstat (limited to 'include/input')
-rw-r--r--include/input/InputEventLabels.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index 279ac40..df50237 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -271,6 +271,34 @@ static const InputEventLabel KEYCODES[] = {
DEFINE_KEYCODE(LAST_CHANNEL),
DEFINE_KEYCODE(TV_DATA_SERVICE),
DEFINE_KEYCODE(VOICE_ASSIST),
+ DEFINE_KEYCODE(TV_RADIO_SERVICE),
+ DEFINE_KEYCODE(TV_TELETEXT),
+ DEFINE_KEYCODE(TV_NUMBER_ENTRY),
+ DEFINE_KEYCODE(TV_TERRESTRIAL_ANALOG),
+ DEFINE_KEYCODE(TV_TERRESTRIAL_DIGITAL),
+ DEFINE_KEYCODE(TV_SATELLITE),
+ DEFINE_KEYCODE(TV_SATELLITE_BS),
+ DEFINE_KEYCODE(TV_SATELLITE_CS),
+ DEFINE_KEYCODE(TV_SATELLITE_SERVICE),
+ DEFINE_KEYCODE(TV_NETWORK),
+ DEFINE_KEYCODE(TV_ANTENNA_CABLE),
+ DEFINE_KEYCODE(TV_INPUT_HDMI_1),
+ DEFINE_KEYCODE(TV_INPUT_HDMI_2),
+ DEFINE_KEYCODE(TV_INPUT_HDMI_3),
+ DEFINE_KEYCODE(TV_INPUT_HDMI_4),
+ DEFINE_KEYCODE(TV_INPUT_COMPOSITE_1),
+ DEFINE_KEYCODE(TV_INPUT_COMPOSITE_2),
+ DEFINE_KEYCODE(TV_INPUT_COMPONENT_1),
+ DEFINE_KEYCODE(TV_INPUT_COMPONENT_2),
+ DEFINE_KEYCODE(TV_INPUT_VGA_1),
+ DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION),
+ DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_UP),
+ DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_DOWN),
+ DEFINE_KEYCODE(TV_ZOOM_MODE),
+ DEFINE_KEYCODE(TV_CONTENTS_MENU),
+ DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU),
+ DEFINE_KEYCODE(TV_TIMER_PROGRAMMING),
+ DEFINE_KEYCODE(HELP),
{ NULL, 0 }
};