diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 14:46:17 +0100 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2015-05-14 14:46:17 +0100 |
| commit | 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3 (patch) | |
| tree | 0a15a5d433a0b65a5bb8946ddbccc22de4dbae3b /include/input | |
| parent | 48a8a0e4322969e1551536d6183af3a1faa2240b (diff) | |
| download | frameworks_native-70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.zip frameworks_native-70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.tar.gz frameworks_native-70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.tar.bz2 | |
Revert "Add new MotionEvent actions for button press and release."
This reverts commit 48a8a0e4322969e1551536d6183af3a1faa2240b.
Diffstat (limited to 'include/input')
| -rw-r--r-- | include/input/Input.h | 6 | ||||
| -rw-r--r-- | include/input/InputTransport.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index 1da8356..c360f63 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -379,10 +379,6 @@ 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; } @@ -536,7 +532,6 @@ public: int32_t deviceId, int32_t source, int32_t action, - int32_t actionButton, int32_t flags, int32_t edgeFlags, int32_t metaState, @@ -589,7 +584,6 @@ 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 6dc77b7..e7e383b 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -84,7 +84,6 @@ struct InputMessage { int32_t deviceId; int32_t source; int32_t action; - int32_t actionButton; int32_t flags; int32_t metaState; int32_t buttonState; @@ -233,7 +232,6 @@ public: int32_t deviceId, int32_t source, int32_t action, - int32_t actionButton, int32_t flags, int32_t edgeFlags, int32_t metaState, |