Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45395fc7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not transform values from a SOURCE_MOUSE_RELATIVE device" into tm-qpr-dev am: 7e9fa6ea 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19100640



Change-Id: Ibd14ebd0b7b8328309673cdca353c0238ded6040
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a085bad6 7e9fa6ea

libs/input/Input.cpp

+3 −2
Original line number Diff line number Diff line
@@ -64,9 +64,10 @@ float transformAngle(const ui::Transform& transform, float angleRadians) { 
}



bool shouldDisregardTransformation(uint32_t source) {

    // Do not apply any transformations to axes from joysticks or touchpads.

    // Do not apply any transformations to axes from joysticks, touchpads, or relative mice.

    return isFromSource(source, AINPUT_SOURCE_CLASS_JOYSTICK) ||

            isFromSource(source, AINPUT_SOURCE_CLASS_POSITION);

            isFromSource(source, AINPUT_SOURCE_CLASS_POSITION) ||

            isFromSource(source, AINPUT_SOURCE_MOUSE_RELATIVE);

}



bool shouldDisregardOffset(uint32_t source) {

libs/input/tests/InputEvent_test.cpp

+5 −5
Original line number Diff line number Diff line
@@ -715,10 +715,10 @@ TEST_F(MotionEventTest, ApplyTransform) { 
}



TEST_F(MotionEventTest, JoystickAndTouchpadAreNotTransformed) {

    constexpr static std::array kNonTransformedSources = {std::pair(AINPUT_SOURCE_TOUCHPAD,

                                                                    AMOTION_EVENT_ACTION_DOWN),

                                                          std::pair(AINPUT_SOURCE_JOYSTICK,

                                                                    AMOTION_EVENT_ACTION_MOVE)};

    constexpr static std::array kNonTransformedSources =

            {std::pair(AINPUT_SOURCE_TOUCHPAD, AMOTION_EVENT_ACTION_DOWN),

             std::pair(AINPUT_SOURCE_JOYSTICK, AMOTION_EVENT_ACTION_MOVE),

             std::pair(AINPUT_SOURCE_MOUSE_RELATIVE, AMOTION_EVENT_ACTION_MOVE)};

    // Create a rotate-90 transform with an offset (like a window which isn't fullscreen).

    ui::Transform transform(ui::Transform::ROT_90, 800, 400);

    transform.set(transform.tx() + 20, transform.ty() + 40);
@@ -738,7 +738,7 @@ TEST_F(MotionEventTest, JoystickAndTouchpadAreNotTransformed) { 
TEST_F(MotionEventTest, NonPointerSourcesAreNotTranslated) {

    constexpr static std::array kNonPointerSources = {std::pair(AINPUT_SOURCE_TRACKBALL,

                                                                AMOTION_EVENT_ACTION_DOWN),

                                                      std::pair(AINPUT_SOURCE_MOUSE_RELATIVE,

                                                      std::pair(AINPUT_SOURCE_TOUCH_NAVIGATION,

                                                                AMOTION_EVENT_ACTION_MOVE)};

    // Create a rotate-90 transform with an offset (like a window which isn't fullscreen).

    ui::Transform transform(ui::Transform::ROT_90, 800, 400);

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+5 −3
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 
        }

    }



    if (!changes || (changes & InputReaderConfiguration::CHANGE_DISPLAY_INFO)) {

    if (!changes || (changes & InputReaderConfiguration::CHANGE_DISPLAY_INFO) ||

        configurePointerCapture) {

        mOrientation = DISPLAY_ORIENTATION_0;

        const bool isOrientedDevice =

                (mParameters.orientationAware && mParameters.hasAssociatedDisplay);
@@ -208,8 +209,9 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 
        // anything if the device is already orientation-aware. If the device is not

        // orientation-aware, then we need to apply the inverse rotation of the display so that

        // when the display rotation is applied later as a part of the per-window transform, we

        // get the expected screen coordinates.

        if (!isOrientedDevice) {

        // get the expected screen coordinates. When pointer capture is enabled, we do not apply any

        // rotations and report values directly from the input device.

        if (!isOrientedDevice && mParameters.mode != Parameters::Mode::POINTER_RELATIVE) {

            std::optional<DisplayViewport> internalViewport =

                    config->getDisplayViewportByType(ViewportType::INTERNAL);

            if (internalViewport) {

services/inputflinger/tests/InputReader_test.cpp

+42 −0
Original line number Diff line number Diff line
@@ -4969,6 +4969,48 @@ TEST_F(CursorInputMapperTest, PointerCaptureDisablesVelocityProcessing) { 
    ASSERT_EQ(20, args.pointerCoords[0].getY());

}



TEST_F(CursorInputMapperTest, PointerCaptureDisablesOrientationChanges) {

    addConfigurationProperty("cursor.mode", "pointer");

    CursorInputMapper& mapper = addMapperAndConfigure<CursorInputMapper>();



    NotifyDeviceResetArgs resetArgs;

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyDeviceResetWasCalled(&resetArgs));

    ASSERT_EQ(ARBITRARY_TIME, resetArgs.eventTime);

    ASSERT_EQ(DEVICE_ID, resetArgs.deviceId);



    // Ensure the display is rotated.

    prepareDisplay(DISPLAY_ORIENTATION_90);



    NotifyMotionArgs args;



    // Verify that the coordinates are rotated.

    process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_X, 10);

    process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_Y, 20);

    process(mapper, ARBITRARY_TIME, READ_TIME, EV_SYN, SYN_REPORT, 0);

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, args.source);

    ASSERT_EQ(AMOTION_EVENT_ACTION_HOVER_MOVE, args.action);

    ASSERT_EQ(-20, args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_X));

    ASSERT_EQ(10, args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_Y));



    // Enable Pointer Capture.

    mFakePolicy->setPointerCapture(true);

    configureDevice(InputReaderConfiguration::CHANGE_POINTER_CAPTURE);

    NotifyPointerCaptureChangedArgs captureArgs;

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyCaptureWasCalled(&captureArgs));

    ASSERT_TRUE(captureArgs.request.enable);



    // Move and verify rotation is not applied.

    process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_X, 10);

    process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_Y, 20);

    process(mapper, ARBITRARY_TIME, READ_TIME, EV_SYN, SYN_REPORT, 0);

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));

    ASSERT_EQ(AINPUT_SOURCE_MOUSE_RELATIVE, args.source);

    ASSERT_EQ(AMOTION_EVENT_ACTION_MOVE, args.action);

    ASSERT_EQ(10, args.pointerCoords[0].getX());

    ASSERT_EQ(20, args.pointerCoords[0].getY());

}



TEST_F(CursorInputMapperTest, Process_ShouldHandleDisplayId) {

    CursorInputMapper& mapper = addMapperAndConfigure<CursorInputMapper>();