diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-01 17:08:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 17:08:34 -0700 |
| commit | efb8a3d6e058c8bc90bb9da6c58dde453f359851 (patch) | |
| tree | 4c356bd35a137e560b1a563a9ceff6366d90ca9d /include/ui/Input.h | |
| parent | 82a1372070e75df1a0201b22e33514bbb0d7b5e5 (diff) | |
| parent | 57fa3e8b4c94125ddb5be015dd7fbde4a458894f (diff) | |
| download | frameworks_base-efb8a3d6e058c8bc90bb9da6c58dde453f359851.zip frameworks_base-efb8a3d6e058c8bc90bb9da6c58dde453f359851.tar.gz frameworks_base-efb8a3d6e058c8bc90bb9da6c58dde453f359851.tar.bz2 | |
am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Merge commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f'
* commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f':
Support haptic feedback for virtual keys defined in key layout.
Diffstat (limited to 'include/ui/Input.h')
| -rw-r--r-- | include/ui/Input.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/ui/Input.h b/include/ui/Input.h index 21baf32..ee40b85 100644 --- a/include/ui/Input.h +++ b/include/ui/Input.h @@ -73,7 +73,8 @@ namespace android { * policy decisions such as waking from device sleep. */ enum { - /* These flags originate in RawEvents and are generally set in the key map. */ + /* These flags originate in RawEvents and are generally set in the key map. + * See also labels for policy flags in KeycodeLabels.h. */ POLICY_FLAG_WAKE = 0x00000001, POLICY_FLAG_WAKE_DROPPED = 0x00000002, @@ -83,6 +84,7 @@ enum { POLICY_FLAG_ALT_GR = 0x00000020, POLICY_FLAG_MENU = 0x00000040, POLICY_FLAG_LAUNCHER = 0x00000080, + POLICY_FLAG_VIRTUAL = 0x00000100, POLICY_FLAG_RAW_MASK = 0x0000ffff, |