summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2016-01-13 01:00:25 -0800
committerPrashant Malani <pmalani@google.com>2016-01-13 01:00:25 -0800
commitd983fd11d4a00b03f92d09f32c08840e66d90777 (patch)
treef7c2461a67757d4865e60541ed911ffc4d48f5fe /include
parent2c09b78656dd97727f94fada81845b133cf142f3 (diff)
downloadframeworks_native-d983fd11d4a00b03f92d09f32c08840e66d90777.zip
frameworks_native-d983fd11d4a00b03f92d09f32c08840e66d90777.tar.gz
frameworks_native-d983fd11d4a00b03f92d09f32c08840e66d90777.tar.bz2
Revert "inputflinger: Initial support for rotary encoders."
This reverts commit ac72bbf4e46d6689070df09a25db2960a9036eb2.
Diffstat (limited to 'include')
-rw-r--r--include/android/input.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/android/input.h b/include/android/input.h
index 5eeb7fc..5ab4e29 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -644,13 +644,6 @@ enum {
*/
AMOTION_EVENT_AXIS_TILT = 25,
/**
- * Axis constant: Generic scroll axis of a motion event.
- *
- * - This is used for scroll axis motion events that can't be classified as strictly
- * vertical or horizontal. The movement of a rotating scroller is an example of this.
- */
- AMOTION_EVENT_AXIS_SCROLL = 26,
- /**
* Axis constant: Generic 1 axis of a motion event.
* The interpretation of a generic axis is device-specific.
*/
@@ -824,8 +817,6 @@ enum {
AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,
/** joystick */
AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
- /** rotary encoder */
- AINPUT_SOURCE_ROTARY_ENCODER = 0x00400000 | AINPUT_SOURCE_CLASS_NONE,
/** any */
AINPUT_SOURCE_ANY = 0xffffff00,