Change tests to use AXIS_LTRIGGER/RTRIGGER instead of AXIS_GAS/BRAKE
Test: atest CtsHardwareTestCases, atest InputDeviceKeyLayoutMapTest
Bug: 228534915, 197062720
Change-Id: I3caf1843188309da34b48f82c5b694b02a403ef3
diff --git a/tests/tests/hardware/res/raw/microsoft_xbox2020_motioneventtests.json b/tests/tests/hardware/res/raw/microsoft_xbox2020_motioneventtests.json
index 450dbd4..e35e13f 100755
--- a/tests/tests/hardware/res/raw/microsoft_xbox2020_motioneventtests.json
+++ b/tests/tests/hardware/res/raw/microsoft_xbox2020_motioneventtests.json
@@ -201,8 +201,8 @@
],
"source": "JOYSTICK",
"events": [
- {"action": "MOVE", "axes": {"AXIS_BRAKE": 1.0}},
- {"action": "MOVE", "axes": {"AXIS_BRAKE": 0}}
+ {"action": "MOVE", "axes": {"AXIS_LTRIGGER": 1.0, "AXIS_BRAKE": 1.0}},
+ {"action": "MOVE", "axes": {"AXIS_LTRIGGER": 0, "AXIS_BRAKE": 0}}
]
},
@@ -216,8 +216,8 @@
],
"source": "JOYSTICK",
"events": [
- {"action": "MOVE", "axes": {"AXIS_GAS": 1.0}},
- {"action": "MOVE", "axes": {"AXIS_GAS": 0}}
+ {"action": "MOVE", "axes": {"AXIS_RTRIGGER": 1.0, "AXIS_GAS": 1.0}},
+ {"action": "MOVE", "axes": {"AXIS_RTRIGGER": 0, "AXIS_GAS": 0}}
]
}
]
diff --git a/tests/tests/view/res/raw/Generic.kl b/tests/tests/view/res/raw/Generic.kl
index 7c28cbf..d58469b 100644
--- a/tests/tests/view/res/raw/Generic.kl
+++ b/tests/tests/view/res/raw/Generic.kl
@@ -428,8 +428,8 @@
axis 0x06 THROTTLE
axis 0x07 RUDDER
axis 0x08 WHEEL
-axis 0x09 GAS
-axis 0x0a BRAKE
+axis 0x09 RTRIGGER
+axis 0x0a LTRIGGER
axis 0x10 HAT_X
axis 0x11 HAT_Y
