ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am dea63477: am b1bbfc2d: Merge "Add Voice Assist key." into lmp-dev 

* commit 'dea63477e470f3bbcdbe16fcaa20343a4cf4d186':
  Add Voice Assist key.
This commit is contained in:
Michael Wright 2014-08-22 18:31:03 +00:00 committed by Android Git Automerger
parent 267ede01de dea63477e4
commit 96f33be717
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/android/keycodes.h
View File

@ -273,7 +273,8 @@ enum {
AKEYCODE_11 = 227,
AKEYCODE_12 = 228,
AKEYCODE_LAST_CHANNEL = 229,
AKEYCODE_TV_DATA_SERVICE = 230
AKEYCODE_TV_DATA_SERVICE = 230,
AKEYCODE_VOICE_ASSIST = 231
// NOTE: If you add a new keycode here you must also add it to several other files.
// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

1
include/input/InputEventLabels.h
View File

@ -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 }
};