commit edf6ce710115b8871a8def72edbdfd6c0b15569e
author Harry Cutts <hcutts@google.com> Wed Jan 04 12:15:53 2023 +0000
committer Harry Cutts <hcutts@google.com> Wed Jan 04 19:55:02 2023 +0000
tree 731e4b82974d93f3ff5e1fbc8539619b41192577
parent 990ff7ba368f3d24ba6ac25321e326c82f13d620

TouchpadInputMapper: rotate pointer movement with display

Bug: 263378323
Test: Rotate device to landscape, check pointer movements are rotated
Test: atest inputflinger_tests
Change-Id: I548ec8b31a90a575253a8fe004c67cb1fbbf51e8

services/inputflinger/tests/GestureConverter_test.cpp

diff --git a/services/inputflinger/tests/GestureConverter_test.cpp b/services/inputflinger/tests/GestureConverter_test.cpp
index 91efd1a..74c2028 100644
--- a/services/inputflinger/tests/GestureConverter_test.cpp
+++ b/services/inputflinger/tests/GestureConverter_test.cpp
@@ -29,6 +29,7 @@
 #include "TestInputListener.h"
 #include "TestInputListenerMatchers.h"
 #include "include/gestures.h"
+#include "ui/Rotation.h"
 
 namespace android {
 
@@ -77,6 +78,23 @@
     ASSERT_NO_FATAL_FAILURE(mFakePointerController->assertPosition(95, 210));
 }
 
+TEST_F(GestureConverterTest, Move_Rotated) {
+    GestureConverter converter(*mReader->getContext(), DEVICE_ID);
+    converter.setOrientation(ui::ROTATION_90);
+
+    Gesture moveGesture(kGestureMove, ARBITRARY_GESTURE_TIME, ARBITRARY_GESTURE_TIME, -5, 10);
+    std::list<NotifyArgs> args = converter.handleGesture(ARBITRARY_TIME, READ_TIME, moveGesture);
+    ASSERT_EQ(1u, args.size());
+
+    ASSERT_THAT(std::get<NotifyMotionArgs>(args.front()),
+                AllOf(WithMotionAction(AMOTION_EVENT_ACTION_HOVER_MOVE),
+                      WithCoords(POINTER_X + 10, POINTER_Y + 5), WithRelativeMotion(10, 5),
+                      WithToolType(AMOTION_EVENT_TOOL_TYPE_FINGER), WithButtonState(0),
+                      WithPressure(0.0f)));
+
+    ASSERT_NO_FATAL_FAILURE(mFakePointerController->assertPosition(110, 205));
+}
+
 TEST_F(GestureConverterTest, ButtonsChange) {
     GestureConverter converter(*mReader->getContext(), DEVICE_ID);