summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-01 17:37:58 -0700
committerJeff Brown <jeffbrown@google.com>2011-07-25 20:04:18 -0700
commit49754db5a304d995c1cc108ff6f19e4ba4265572 (patch)
treecb09f23e7dd81ea505f90962fd550e36afbbc422 /native
parent44e504e089b7483448c386741c5ee31d2c325400 (diff)
downloadframeworks_base-49754db5a304d995c1cc108ff6f19e4ba4265572.zip
frameworks_base-49754db5a304d995c1cc108ff6f19e4ba4265572.tar.gz
frameworks_base-49754db5a304d995c1cc108ff6f19e4ba4265572.tar.bz2
Handle stylus buttons and tool types.
Added TOOL_TYPE_ERASER. Refactored the InputReader to share more code between the various input mappers that handle button states and to simplify the accumulator implementations by having each one only handle a single type of input. Removed the concept of direct/indirect tool types from the API. If we add it back, it should be done in a manner that is orthogonal to the tool type itself, perhaps as a flags field on the pointer. The device source may well provide sufficient information anyhow. Change-Id: I811c22d95e8304269b6ee4f6d11a6b04f3cfc1b2
Diffstat (limited to 'native')
-rw-r--r--native/include/android/input.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/native/include/android/input.h b/native/include/android/input.h
index 0d8ea28..7a0dcd3 100644
--- a/native/include/android/input.h
+++ b/native/include/android/input.h
@@ -415,8 +415,7 @@ enum {
AMOTION_EVENT_TOOL_TYPE_FINGER = 1,
AMOTION_EVENT_TOOL_TYPE_STYLUS = 2,
AMOTION_EVENT_TOOL_TYPE_MOUSE = 3,
- AMOTION_EVENT_TOOL_TYPE_INDIRECT_FINGER = 4,
- AMOTION_EVENT_TOOL_TYPE_INDIRECT_STYLUS = 5,
+ AMOTION_EVENT_TOOL_TYPE_ERASER = 4,
};
/*