summaryrefslogtreecommitdiffstats
path: root/include/androidfw
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-06-13 18:28:57 -0700
committerJeff Brown <jeffbrown@google.com>2012-06-14 04:16:26 -0700
commitde7a8ead2467a4a152a5a9b2416c8048f1b48bbb (patch)
tree5ab60322af4c99c1c24eb96f44883a77a867d843 /include/androidfw
parent82134f76936be049cc4b23a894ba7decc1d59952 (diff)
downloadframeworks_base-de7a8ead2467a4a152a5a9b2416c8048f1b48bbb.zip
frameworks_base-de7a8ead2467a4a152a5a9b2416c8048f1b48bbb.tar.gz
frameworks_base-de7a8ead2467a4a152a5a9b2416c8048f1b48bbb.tar.bz2
Add new ASSIST key and map it to the global assist intent.
Moved some duplicate code from SearchPanelView and LockScreen over to SearchManager to avoid creating yet another copy of it in PhoneWindowManager. Bug: 6594275 Change-Id: Ib4ebcd6817639d17548952ab2ce7cb876c05777c
Diffstat (limited to 'include/androidfw')
-rwxr-xr-xinclude/androidfw/KeycodeLabels.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/androidfw/KeycodeLabels.h b/include/androidfw/KeycodeLabels.h
index 1828062..538949d 100755
--- a/include/androidfw/KeycodeLabels.h
+++ b/include/androidfw/KeycodeLabels.h
@@ -243,6 +243,7 @@ static const KeycodeLabel KEYCODES[] = {
{ "YEN", 216 },
{ "RO", 217 },
{ "KANA", 218 },
+ { "ASSIST", 219 },
// 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.