summaryrefslogtreecommitdiffstats
path: root/include/android
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-05-14 14:48:03 +0100
committerMichael Wright <michaelwr@google.com>2015-05-14 14:48:03 +0100
commit7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f (patch)
treec30586e4c77090e21da1c3abb05900806059d358 /include/android
parent70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3 (diff)
downloadframeworks_native-7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f.zip
frameworks_native-7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f.tar.gz
frameworks_native-7b159c9a4f589da7fdab7c16f3aefea25e0e7e4f.tar.bz2
Revert "Revert "Add new MotionEvent actions for button press and release.""
This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
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 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,
};
/*