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

Commit f209b619 authored by Josep del Río's avatar Josep del Río Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use both mouse and touchpad sources for touchpads""

parents 7eb78c1d 2d8c79af

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+0 −2
Original line number Diff line number Diff line
@@ -884,8 +884,6 @@ void TouchInputMapper::configureInputDevice(nsecs_t when, bool* outResetNeeded) 
        mDeviceMode = DeviceMode::POINTER;

        if (hasStylus()) {

            mSource |= AINPUT_SOURCE_STYLUS;

        } else {

            mSource |= AINPUT_SOURCE_TOUCHPAD;

        }

    } else if (isTouchScreen()) {

        mSource = AINPUT_SOURCE_TOUCHSCREEN;

services/inputflinger/tests/InputReader_test.cpp

+8 −8
Original line number Diff line number Diff line
@@ -5036,7 +5036,7 @@ TEST_F(SingleTouchInputMapperTest, GetSources_WhenDeviceTypeIsNotSpecifiedAndNot 
    prepareAxes(POSITION);

    SingleTouchInputMapper& mapper = addMapperAndConfigure<SingleTouchInputMapper>();



    ASSERT_EQ(AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD, mapper.getSources());

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());

}



TEST_F(SingleTouchInputMapperTest, GetSources_WhenDeviceTypeIsTouchScreen_ReturnsTouchScreen) {
@@ -8865,8 +8865,8 @@ TEST_F(MultiTouchInputMapperTest, Process_Pointer_ShouldHandleDisplayId) { 
    prepareAxes(POSITION);

    MultiTouchInputMapper& mapper = addMapperAndConfigure<MultiTouchInputMapper>();



    // Check source is a touchpad that would obtain the PointerController.

    ASSERT_EQ(AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD, mapper.getSources());

    // Check source is mouse that would obtain the PointerController.

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());



    NotifyMotionArgs motionArgs;

    processPosition(mapper, 100, 100);
@@ -9936,11 +9936,11 @@ TEST_F(MultiTouchInputMapperTest, Process_TouchpadCapture) { 
    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));

    ASSERT_EQ(AMOTION_EVENT_ACTION_UP, args.action);



    // A non captured touchpad should have a mouse and touchpad source.

    // non captured touchpad should be a mouse source

    mFakePolicy->setPointerCapture(false);

    configureDevice(InputReaderConfiguration::CHANGE_POINTER_CAPTURE);

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

    ASSERT_EQ(AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD, mapper.getSources());

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());

}



TEST_F(MultiTouchInputMapperTest, Process_UnCapturedTouchpadPointer) {
@@ -9999,10 +9999,10 @@ TEST_F(MultiTouchInputMapperTest, WhenCapturedAndNotCaptured_GetSources) { 
    mFakePolicy->setPointerCapture(false);

    MultiTouchInputMapper& mapper = addMapperAndConfigure<MultiTouchInputMapper>();



    // An uncaptured touchpad should be a pointer device, with additional touchpad source.

    ASSERT_EQ(AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD, mapper.getSources());

    // uncaptured touchpad should be a pointer device

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());



    // A captured touchpad should just have a touchpad source.

    // captured touchpad should be a touchpad device

    mFakePolicy->setPointerCapture(true);

    configureDevice(InputReaderConfiguration::CHANGE_POINTER_CAPTURE);

    ASSERT_EQ(AINPUT_SOURCE_TOUCHPAD, mapper.getSources());