summaryrefslogtreecommitdiffstats
path: root/include/android
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-05-14 19:28:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-14 19:28:10 +0000
commit9897516aba469689ca8b1e9e7de7671bcaeb2fac (patch)
tree4b77b46f4a3e6a5284619eae21d838081f36bc7c /include/android
parent7472fa996a4dbd4ce89e3875533ef28686df7343 (diff)
parentf27e6681048f3ee7a589ab824a1041667ff838e0 (diff)
downloadframeworks_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/android')
-rw-r--r--include/android/input.h8
1 files changed, 8 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,
};
/**