diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 19:28:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 19:28:18 +0000 |
| commit | c01f5d2e1989a502d58359f2f0c9812831160107 (patch) | |
| tree | d924f14d55e903f7ebb2b9613958e97133fbfa77 /include | |
| parent | 9897516aba469689ca8b1e9e7de7671bcaeb2fac (diff) | |
| parent | c921ce268155e8e1d75bd423514bb5a3ee363440 (diff) | |
| download | frameworks_native-c01f5d2e1989a502d58359f2f0c9812831160107.zip frameworks_native-c01f5d2e1989a502d58359f2f0c9812831160107.tar.gz frameworks_native-c01f5d2e1989a502d58359f2f0c9812831160107.tar.bz2 | |
am c921ce26: Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
* commit 'c921ce268155e8e1d75bd423514bb5a3ee363440':
Revert "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, 0 insertions, 16 deletions
diff --git a/include/android/input.h b/include/android/input.h index 7b76539..b11af84 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -336,12 +336,6 @@ 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, }; /** @@ -743,8 +737,6 @@ 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 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, |