Reland "Change PointerController to display space"

259a2122aeafea0f20bfcc7c9bcd089511a5aa56

Bug: 188939842
Bug: 144544464
Bug: 206817973
Test: forrest run - CtsHardwareTestCases

Change-Id: I8f0312a502ec5c79038ef1697cf2d5b23db9fcfc

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index 8974b22c86..cb93c92310 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -60,12 +60,6 @@ float transformAngle(const ui::Transform& transform, float angleRadians) {
     return atan2f(transformedPoint.x, -transformedPoint.y);
 }
 
-vec2 transformWithoutTranslation(const ui::Transform& transform, const vec2& xy) {
-    const vec2 transformedXy = transform.transform(xy);
-    const vec2 transformedOrigin = transform.transform(0, 0);
-    return transformedXy - transformedOrigin;
-}
-
 bool shouldDisregardTransformation(uint32_t source) {
     // Do not apply any transformations to axes from joysticks or touchpads.
     return isFromSource(source, AINPUT_SOURCE_CLASS_JOYSTICK) ||
@@ -120,6 +114,12 @@ int32_t IdGenerator::nextId() const {
 
 // --- InputEvent ---
 
+vec2 transformWithoutTranslation(const ui::Transform& transform, const vec2& xy) {
+    const vec2 transformedXy = transform.transform(xy);
+    const vec2 transformedOrigin = transform.transform(0, 0);
+    return transformedXy - transformedOrigin;
+}
+
 const char* inputEventTypeToString(int32_t type) {
     switch (type) {
         case AINPUT_EVENT_TYPE_KEY: {