diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-07-08 19:01:13 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-07-08 19:01:13 -0700 |
| commit | 1a33274d28a3174b9062ae0dcce77bf1d68cd463 (patch) | |
| tree | ad0409bd5168ca72c259f531047b9837907d54c6 /include | |
| parent | 6f10db885f82e6037bdcc4357026a0cb70da742c (diff) | |
| parent | 167449e5f810a49741133de375eea1006f7218c0 (diff) | |
| download | frameworks_base-1a33274d28a3174b9062ae0dcce77bf1d68cd463.zip frameworks_base-1a33274d28a3174b9062ae0dcce77bf1d68cd463.tar.gz frameworks_base-1a33274d28a3174b9062ae0dcce77bf1d68cd463.tar.bz2 | |
resolved conflicts for merge of 167449e5 to master
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/InputReader.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h index 781da35..03c8112 100644 --- a/include/ui/InputReader.h +++ b/include/ui/InputReader.h @@ -250,7 +250,13 @@ struct InputDevice { nsecs_t downTime; struct CurrentVirtualKeyState { - bool down; + enum Status { + STATUS_UP, + STATUS_DOWN, + STATUS_CANCELED + }; + + Status status; nsecs_t downTime; int32_t keyCode; int32_t scanCode; @@ -295,6 +301,7 @@ struct InputDevice { void calculatePointerIds(); bool isPointInsideDisplay(int32_t x, int32_t y) const; + const InputDevice::VirtualKey* findVirtualKeyHit() const; }; InputDevice(int32_t id, uint32_t classes, String8 name); @@ -390,11 +397,9 @@ public: virtual bool getDisplayInfo(int32_t displayId, int32_t* width, int32_t* height, int32_t* orientation) = 0; - /* Provides feedback for a virtual key. + /* Provides feedback for a virtual key down. */ - virtual void virtualKeyFeedback(nsecs_t when, int32_t deviceId, - int32_t action, int32_t flags, int32_t keyCode, - int32_t scanCode, int32_t metaState, nsecs_t downTime) = 0; + virtual void virtualKeyDownFeedback() = 0; /* Intercepts a key event. * The policy can use this method as an opportunity to perform power management functions |