diff options
| author | Michael Wright <michaelwr@google.com> | 2014-08-22 18:31:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 18:31:03 +0000 |
| commit | 96f33be7175f4496973e4931cefcba10bff169a4 (patch) | |
| tree | 968f1b940889d1d4f738eda233ea140302987e7a /include/input | |
| parent | 267ede01defaef537cff64736bfa25b408ee6d23 (diff) | |
| parent | dea63477e470f3bbcdbe16fcaa20343a4cf4d186 (diff) | |
| download | frameworks_native-96f33be7175f4496973e4931cefcba10bff169a4.zip frameworks_native-96f33be7175f4496973e4931cefcba10bff169a4.tar.gz frameworks_native-96f33be7175f4496973e4931cefcba10bff169a4.tar.bz2 | |
am dea63477: am b1bbfc2d: Merge "Add Voice Assist key." into lmp-dev
* commit 'dea63477e470f3bbcdbe16fcaa20343a4cf4d186':
Add Voice Assist key.
Diffstat (limited to 'include/input')
| -rw-r--r-- | include/input/InputEventLabels.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index 51f7661..279ac40 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -270,6 +270,7 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(12), DEFINE_KEYCODE(LAST_CHANNEL), DEFINE_KEYCODE(TV_DATA_SERVICE), + DEFINE_KEYCODE(VOICE_ASSIST), { NULL, 0 } }; |