diff options
| author | Wally Yau <wyau@google.com> | 2014-09-03 19:23:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 19:23:54 +0000 |
| commit | 07815f2989171f7465e90983bc996691674c9b68 (patch) | |
| tree | b0359f8744073150833c7975fa28cae7509214e5 /include/input | |
| parent | 78b26747e218ee394664230b4a901ad56c292d6d (diff) | |
| parent | 3aa066e9d7480f0be806ac2d9f92bbb22771477b (diff) | |
| download | frameworks_native-07815f2989171f7465e90983bc996691674c9b68.zip frameworks_native-07815f2989171f7465e90983bc996691674c9b68.tar.gz frameworks_native-07815f2989171f7465e90983bc996691674c9b68.tar.bz2 | |
am 3aa066e9: am 19f8b79f: Merge "New keycode definitions for TV remotes." into lmp-dev
* commit '3aa066e9d7480f0be806ac2d9f92bbb22771477b':
New keycode definitions for TV remotes.
Diffstat (limited to 'include/input')
| -rw-r--r-- | include/input/InputEventLabels.h | 28 |
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 } }; |