summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2010-07-07 17:43:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-07 17:43:12 -0700
commit9e1568cc2d12a713db524515f1002e34973ab4f4 (patch)
treedd280dcaad7da926ac86098f2f9be1ead3a6e589 /include
parentb687191959c5c4cc13c1ece6c1608e1ba2c4faf7 (diff)
parentf16c26dec9651628b0c130e2504e2cc911393aea (diff)
downloadframeworks_native-9e1568cc2d12a713db524515f1002e34973ab4f4.zip
frameworks_native-9e1568cc2d12a713db524515f1002e34973ab4f4.tar.gz
frameworks_native-9e1568cc2d12a713db524515f1002e34973ab4f4.tar.bz2
Merge "More native input dispatch work." into gingerbread
Diffstat (limited to 'include')
-rw-r--r--include/ui/InputReader.h15
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