diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 14:48:03 +0100 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2015-05-14 14:48:03 +0100 |
| commit | 7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f (patch) | |
| tree | c30586e4c77090e21da1c3abb05900806059d358 /include/input | |
| parent | 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3 (diff) | |
| download | frameworks_native-7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f.zip frameworks_native-7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f.tar.gz frameworks_native-7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f.tar.bz2 | |
Revert "Revert "Add new MotionEvent actions for button press and release.""
This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
Diffstat (limited to 'include/input')
| -rw-r--r-- | include/input/Input.h | 6 | ||||
| -rw-r--r-- | include/input/InputTransport.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index c360f63..1da8356 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -379,6 +379,10 @@ public: inline int32_t getButtonState() const { return mButtonState; } + inline int32_t setButtonState(int32_t buttonState) { mButtonState = buttonState; } + + inline int32_t getActionButton() const { return mActionButton; } + inline float getXOffset() const { return mXOffset; } inline float getYOffset() const { return mYOffset; } @@ -532,6 +536,7 @@ public: int32_t deviceId, int32_t source, int32_t action, + int32_t actionButton, int32_t flags, int32_t edgeFlags, int32_t metaState, @@ -584,6 +589,7 @@ public: protected: int32_t mAction; + int32_t mActionButton; int32_t mFlags; int32_t mEdgeFlags; int32_t mMetaState; diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h index e7e383b..6dc77b7 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -84,6 +84,7 @@ struct InputMessage { int32_t deviceId; int32_t source; int32_t action; + int32_t actionButton; int32_t flags; int32_t metaState; int32_t buttonState; @@ -232,6 +233,7 @@ public: int32_t deviceId, int32_t source, int32_t action, + int32_t actionButton, int32_t flags, int32_t edgeFlags, int32_t metaState, |