diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 15:31:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 15:31:21 +0000 |
| commit | 7c000280a57f352c2485dcaea1d5bfe20f7bfe63 (patch) | |
| tree | f6cfed2123c475f365c44d05b053499cafcb4568 /include/input/Input.h | |
| parent | c921ce268155e8e1d75bd423514bb5a3ee363440 (diff) | |
| parent | b03f103fd40d9028731a81e87a817a3e3bd07fa4 (diff) | |
| download | frameworks_native-7c000280a57f352c2485dcaea1d5bfe20f7bfe63.zip frameworks_native-7c000280a57f352c2485dcaea1d5bfe20f7bfe63.tar.gz frameworks_native-7c000280a57f352c2485dcaea1d5bfe20f7bfe63.tar.bz2 | |
Merge changes from topic 'button_actions' into mnc-dev
* changes:
Fix input tests to work with new MotionEvent member
Revert "Revert "Add new MotionEvent actions for button press and release.""
Diffstat (limited to 'include/input/Input.h')
| -rw-r--r-- | include/input/Input.h | 6 |
1 files changed, 6 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; |