summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-16 13:01:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 13:01:54 -0700
commit61cf67a220ba3205737c646c1c836a92074220de (patch)
tree7d4aa868fcae530b5d5300c060a8f3b8f0ce95c1 /include
parent9284b454e28a49f514f9caddaace15b91d41165c (diff)
parent24326f7223275ba9c85014b86d42040e3a7d2815 (diff)
downloadframeworks_base-61cf67a220ba3205737c646c1c836a92074220de.zip
frameworks_base-61cf67a220ba3205737c646c1c836a92074220de.tar.gz
frameworks_base-61cf67a220ba3205737c646c1c836a92074220de.tar.bz2
am 24326f72: Merge "Input API review." into gingerbread
Merge commit '24326f7223275ba9c85014b86d42040e3a7d2815' into gingerbread-plus-aosp * commit '24326f7223275ba9c85014b86d42040e3a7d2815': Input API review.
Diffstat (limited to 'include')
-rw-r--r--include/ui/EventHub.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/EventHub.h b/include/ui/EventHub.h
index 25d5afb..d6b09dc 100644
--- a/include/ui/EventHub.h
+++ b/include/ui/EventHub.h
@@ -111,10 +111,10 @@ enum {
/* The input device is a multi-touch touchscreen. */
INPUT_DEVICE_CLASS_TOUCHSCREEN_MT= 0x00000010,
- /* The input device is a directional pad. */
+ /* The input device is a directional pad (implies keyboard, has DPAD keys). */
INPUT_DEVICE_CLASS_DPAD = 0x00000020,
- /* The input device is a gamepad (implies keyboard). */
+ /* The input device is a gamepad (implies keyboard, has BUTTON keys). */
INPUT_DEVICE_CLASS_GAMEPAD = 0x00000040,
/* The input device has switches. */