diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 19:28:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 19:28:10 +0000 |
| commit | 9897516aba469689ca8b1e9e7de7671bcaeb2fac (patch) | |
| tree | 4b77b46f4a3e6a5284619eae21d838081f36bc7c /include | |
| parent | 7472fa996a4dbd4ce89e3875533ef28686df7343 (diff) | |
| parent | f27e6681048f3ee7a589ab824a1041667ff838e0 (diff) | |
| download | frameworks_native-9897516aba469689ca8b1e9e7de7671bcaeb2fac.zip frameworks_native-9897516aba469689ca8b1e9e7de7671bcaeb2fac.tar.gz frameworks_native-9897516aba469689ca8b1e9e7de7671bcaeb2fac.tar.bz2 | |
am f27e6681: Merge "Add new MotionEvent actions for button press and release." into mnc-dev
* commit 'f27e6681048f3ee7a589ab824a1041667ff838e0':
Add new MotionEvent actions for button press and release.
Diffstat (limited to 'include')
| -rw-r--r-- | include/android/input.h | 8 | ||||
| -rw-r--r-- | include/input/Input.h | 6 | ||||
| -rw-r--r-- | include/input/InputTransport.h | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/include/android/input.h b/include/android/input.h index b11af84..7b76539 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -336,6 +336,12 @@ enum { /** The pointer is not down but has exited the boundaries of a window or view. */ AMOTION_EVENT_ACTION_HOVER_EXIT = 10, + + /* One or more buttons have been pressed. */ + AMOTION_EVENT_ACTION_BUTTON_PRESS = 11, + + /* One or more buttons have been released. */ + AMOTION_EVENT_ACTION_BUTTON_RELEASE = 12, }; /** @@ -737,6 +743,8 @@ enum { AMOTION_EVENT_BUTTON_BACK = 1 << 3, /** forward */ AMOTION_EVENT_BUTTON_FORWARD = 1 << 4, + AMOTION_EVENT_BUTTON_STYLUS_PRIMARY = 1 << 5, + AMOTION_EVENT_BUTTON_STYLUS_SECONDARY = 1 << 6, }; /** 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, |