commit 7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f
author Michael Wright <michaelwr@google.com> Thu May 14 14:48:03 2015 +0100
committer Michael Wright <michaelwr@google.com> Thu May 14 14:48:03 2015 +0100
tree c30586e4c77090e21da1c3abb05900806059d358
parent 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3

Revert "Revert "Add new MotionEvent actions for button press and release.""

This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.

include/input/Input.h

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 @@
 
     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 @@
             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 @@
 
 protected:
     int32_t mAction;
+    int32_t mActionButton;
     int32_t mFlags;
     int32_t mEdgeFlags;
     int32_t mMetaState;

include/input/InputTransport.h

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 @@
             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 @@
             int32_t deviceId,
             int32_t source,
             int32_t action,
+            int32_t actionButton,
             int32_t flags,
             int32_t edgeFlags,
             int32_t metaState,