Merge "Revert "Add GESTURE_{X,Y}_OFFSET axes to input HAL""diff --git a/input/common/aidl/aidl_api/android.hardware.input.common/current/android/hardware/input/common/Axis.aidl b/input/common/aidl/aidl_api/android.hardware.input.common/current/android/hardware/input/common/Axis.aidl
index 7de95b1..2114c7d 100644
--- a/input/common/aidl/aidl_api/android.hardware.input.common/current/android/hardware/input/common/Axis.aidl
+++ b/input/common/aidl/aidl_api/android.hardware.input.common/current/android/hardware/input/common/Axis.aidl
@@ -79,6 +79,4 @@
GENERIC_14 = 45,
GENERIC_15 = 46,
GENERIC_16 = 47,
- GESTURE_X_OFFSET = 48,
- GESTURE_Y_OFFSET = 49,
}
diff --git a/input/common/aidl/android/hardware/input/common/Axis.aidl b/input/common/aidl/android/hardware/input/common/Axis.aidl
index 1257687..1150949 100644
--- a/input/common/aidl/android/hardware/input/common/Axis.aidl
+++ b/input/common/aidl/android/hardware/input/common/Axis.aidl
@@ -384,21 +384,4 @@
* The interpretation of a generic axis is device-specific.
*/
GENERIC_16 = 47,
-
- /**
- * Axis constant: X gesture offset axis of a motion event.
- *
- * - For a touch pad, reports the distance that a swipe gesture has moved in the X
- * axis, as a proportion of the touch pad's size. For example, if a touch pad is
- * 1000 units wide, and a swipe gesture starts at X = 500 then moves to X = 400,
- * this axis would have a value of -0.1.
- */
- GESTURE_X_OFFSET = 48,
-
- /**
- * Axis constant: Y gesture offset axis of a motion event.
- *
- * The same as GESTURE_X_OFFSET, but for the Y axis.
- */
- GESTURE_Y_OFFSET = 49,
}