summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-11-29 13:17:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-29 13:17:42 -0800
commit0475f82c95e6e9657580820b16b0e48d814119b5 (patch)
tree2ce0fb9ad7b9b7294bcf7a1617d45b21d246141f /native
parent8e6115f622ee2d6ef8023357231b6663b1c091e6 (diff)
parentc339fe302bc5083f0a110569eec06676be511088 (diff)
downloadframeworks_base-0475f82c95e6e9657580820b16b0e48d814119b5.zip
frameworks_base-0475f82c95e6e9657580820b16b0e48d814119b5.tar.gz
frameworks_base-0475f82c95e6e9657580820b16b0e48d814119b5.tar.bz2
am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
* commit 'c339fe302bc5083f0a110569eec06676be511088': Fix application launch shortcuts.
Diffstat (limited to 'native')
-rw-r--r--native/include/android/keycodes.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/native/include/android/keycodes.h b/native/include/android/keycodes.h
index 5d49775..8414ff6 100644
--- a/native/include/android/keycodes.h
+++ b/native/include/android/keycodes.h
@@ -250,6 +250,10 @@ enum {
AKEYCODE_LANGUAGE_SWITCH = 204,
AKEYCODE_MANNER_MODE = 205,
AKEYCODE_3D_MODE = 206,
+ AKEYCODE_CONTACTS = 207,
+ AKEYCODE_CALENDAR = 208,
+ AKEYCODE_MUSIC = 209,
+ AKEYCODE_CALCULATOR = 210,
// 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.