From ccba2d78e925a7c4e34ed9cf72760329e82ddab3 Mon Sep 17 00:00:00 2001 From: Harry Cutts Date: Thu, 8 Dec 2022 14:28:02 +0000 Subject: [PATCH] Revert "Add GESTURE_{X,Y}_OFFSET axes to input HAL" Revert "Depend on V2 of the Input HAL from libservices" Revert submission 20187666-input-hal-gesture-offset Reason for revert: Causes build errors (https://android-build.googleplex.com/builds/submitted/9380741/sdk_finalization/latest/logs/build_error.log) Reverted Changes: I31e8b6975:Add GESTURE_{X,Y}_OFFSET axes to input HAL I2eb4924f3:Depend on V2 of the Input HAL from libservices I13d341fa0:Add asserts for new HAL axes in InputCommonConvert... Change-Id: I808e59e78c0fa8abedef6a58db9c277a84cbc5ae --- .../android/hardware/input/common/Axis.aidl | 2 -- .../android/hardware/input/common/Axis.aidl | 17 ----------------- 2 files changed, 19 deletions(-) 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 7de95b1939..2114c7deb1 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 @@ enum Axis { 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 1257687b0c..11509494fa 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 @@ enum Axis { * 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, }