summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-05-14 15:31:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 15:31:21 +0000
commit7c000280a57f352c2485dcaea1d5bfe20f7bfe63 (patch)
treef6cfed2123c475f365c44d05b053499cafcb4568 /include
parentc921ce268155e8e1d75bd423514bb5a3ee363440 (diff)
parentb03f103fd40d9028731a81e87a817a3e3bd07fa4 (diff)
downloadframeworks_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')
-rw-r--r--include/android/input.h8
-rw-r--r--include/input/Input.h6
-rw-r--r--include/input/InputTransport.h4
3 files changed, 17 insertions, 1 deletions
diff --git a/include/android/input.h b/include/android/input.h
index a660761..c7635b8 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -305,6 +305,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,
};
/*
@@ -405,6 +411,8 @@ enum {
AMOTION_EVENT_BUTTON_TERTIARY = 1 << 2,
AMOTION_EVENT_BUTTON_BACK = 1 << 3,
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..f31bcea 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;
@@ -95,7 +96,7 @@ struct InputMessage {
float yPrecision;
uint32_t pointerCount;
// Note that PointerCoords requires 8 byte alignment.
- struct Pointer{
+ struct Pointer {
PointerProperties properties;
PointerCoords coords;
} pointers[MAX_POINTERS];
@@ -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,