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

Commit f03f83e1 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "CursorInputMapper_test: Verify acceleration updated on display change" into main

parents d0924ebc b4874665

services/inputflinger/tests/CursorInputMapper_test.cpp

+44 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ DisplayViewport createSecondaryViewport() { 
class ViewportFakingInputDeviceContext : public InputDeviceContext {

public:

    ViewportFakingInputDeviceContext(InputDevice& device, int32_t eventHubId,

                                     DisplayViewport viewport)

                                     std::optional<DisplayViewport> viewport)

          : InputDeviceContext(device, eventHubId), mAssociatedViewport(viewport) {}



    ViewportFakingInputDeviceContext(InputDevice& device, int32_t eventHubId,
@@ -117,10 +117,12 @@ public: 
        return mAssociatedViewport;

    }



    void setViewport(const DisplayViewport& viewport) { mAssociatedViewport = viewport; }

    void setViewport(const std::optional<DisplayViewport>& viewport) {

        mAssociatedViewport = viewport;

    }



private:

    DisplayViewport mAssociatedViewport;

    std::optional<DisplayViewport> mAssociatedViewport;

};



} // namespace
@@ -1351,6 +1353,45 @@ TEST_F(CursorInputMapperUnitTestWithNewBallistics, ConfigureAccelerationWithAsso 
                                 InputReaderConfiguration::Change::POINTER_SPEED);

    args.clear();



    args += process(ARBITRARY_TIME, EV_REL, REL_X, 10);

    args += process(ARBITRARY_TIME, EV_REL, REL_Y, 20);

    args += process(ARBITRARY_TIME, EV_SYN, SYN_REPORT, 0);

    ASSERT_THAT(args,

                ElementsAre(VariantWith<NotifyMotionArgs>(AllOf(WithMotionAction(HOVER_MOVE),

                                                                WithDisplayId(DISPLAY_ID),

                                                                WithRelativeMotion(10, 20)))));

}



TEST_F(CursorInputMapperUnitTestWithNewBallistics, ConfigureAccelerationOnDisplayChange) {

    mPropertyMap.addProperty("cursor.mode", "pointer");

    DisplayViewport primaryViewport = createPrimaryViewport(ui::Rotation::Rotation0);

    mReaderConfiguration.setDisplayViewports({primaryViewport});

    // Disable acceleration for the display.

    mReaderConfiguration.displaysWithMousePointerAccelerationDisabled.emplace(DISPLAY_ID);

    createDevice();



    // Don't associate the device with the display yet.

    ViewportFakingInputDeviceContext deviceContext(*mDevice, EVENTHUB_ID,

                                                   /*viewport=*/std::nullopt);

    mMapper = createInputMapper<CursorInputMapper>(deviceContext, mReaderConfiguration);



    std::list<NotifyArgs> args;



    // Verify that acceleration is being applied by default by checking that the movement is scaled.

    args += process(ARBITRARY_TIME, EV_REL, REL_X, 10);

    args += process(ARBITRARY_TIME, EV_REL, REL_Y, 20);

    args += process(ARBITRARY_TIME, EV_SYN, SYN_REPORT, 0);

    ASSERT_THAT(args, ElementsAre(VariantWith<NotifyMotionArgs>(WithMotionAction(HOVER_MOVE))));

    const auto& coords = get<NotifyMotionArgs>(args.back()).pointerCoords[0];

    ASSERT_GT(coords.getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_X), 10.f);

    ASSERT_GT(coords.getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_Y), 20.f);



    // Now associate the device with the display, and verify that acceleration is disabled.

    deviceContext.setViewport(primaryViewport);

    args += mMapper->reconfigure(ARBITRARY_TIME, mReaderConfiguration,

                                 InputReaderConfiguration::Change::DISPLAY_INFO);

    args.clear();



    args += process(ARBITRARY_TIME, EV_REL, REL_X, 10);

    args += process(ARBITRARY_TIME, EV_REL, REL_Y, 20);

    args += process(ARBITRARY_TIME, EV_SYN, SYN_REPORT, 0);