summaryrefslogtreecommitdiff
path: root/include/ui/Input.h
diff options
context:
space:
mode:
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
commit4adce423e481c50b0dad1d1e2bb52c909bb5bd89 (patch)
tree43089c79fd7acffc6c480a2ce0bbf7f15dcd163a /include/ui/Input.h
parent58addfd94b84525c6cb277e6a14959a0a3f768c1 (diff)
parentbd432d461952c3035032805f3c50ed34c1f51c4a (diff)
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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/ui/Input.h b/include/ui/Input.h
index 21baf32599..ee40b85d7b 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,