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

Commit 369cbd15 authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge "Use both mouse and touchpad sources for touchpads"

parents deffcb44 16a24cc6

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+2 −0
Original line number Diff line number Diff line
@@ -830,6 +830,8 @@ 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
@@ -5666,7 +5666,7 @@ TEST_F(SingleTouchInputMapperTest, GetSources_WhenDeviceTypeIsNotSpecifiedAndNot 
    prepareAxes(POSITION);

    SingleTouchInputMapper& mapper = addMapperAndConfigure<SingleTouchInputMapper>();



    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());

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

}



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

    MultiTouchInputMapper& mapper = addMapperAndConfigure<MultiTouchInputMapper>();



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

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());

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

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



    NotifyMotionArgs motionArgs;

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

    ASSERT_EQ(AMOTION_EVENT_ACTION_UP, args.action);



    // non captured touchpad should be a mouse source

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

    mFakePolicy->setPointerCapture(false);

    configureDevice(InputReaderConfiguration::CHANGE_POINTER_CAPTURE);

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

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());

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

}



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

    MultiTouchInputMapper& mapper = addMapperAndConfigure<MultiTouchInputMapper>();



    // uncaptured touchpad should be a pointer device

    ASSERT_EQ(AINPUT_SOURCE_MOUSE, mapper.getSources());

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

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



    // captured touchpad should be a touchpad device

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

    mFakePolicy->setPointerCapture(true);

    configureDevice(InputReaderConfiguration::CHANGE_POINTER_CAPTURE);

    ASSERT_EQ(AINPUT_SOURCE_TOUCHPAD, mapper.getSources());