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

Commit c4aef19d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Include SOURCE_TOUCHPAD for Virtual Navigation Touchpad" into main

parents 4616abce 9cf8f32c

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ void TouchInputMapper::configureInputDevice(nsecs_t when, bool* outResetNeeded) 
            mSource |= AINPUT_SOURCE_STYLUS;

        }

    } else if (mParameters.deviceType == Parameters::DeviceType::TOUCH_NAVIGATION) {

        mSource = AINPUT_SOURCE_TOUCH_NAVIGATION;

        mSource = AINPUT_SOURCE_TOUCH_NAVIGATION | AINPUT_SOURCE_TOUCHPAD;

        mDeviceMode = DeviceMode::NAVIGATION;

    } else {

        ALOGW("Touch device '%s' has invalid parameters or configuration.  The device will be "

services/inputflinger/tests/InputReader_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -6245,7 +6245,7 @@ TEST_F(SingleTouchInputMapperTest, WhenDeviceTypeIsSetToTouchNavigation_setsCorr 
    SingleTouchInputMapper& mapper = constructAndAddMapper<SingleTouchInputMapper>();

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyDeviceResetWasCalled());



    ASSERT_EQ(AINPUT_SOURCE_TOUCH_NAVIGATION, mapper.getSources());

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

}



TEST_F(SingleTouchInputMapperTest, WhenDeviceTypeIsChangedToTouchNavigation_updatesDeviceType) {
@@ -6268,7 +6268,7 @@ TEST_F(SingleTouchInputMapperTest, WhenDeviceTypeIsChangedToTouchNavigation_upda 
                               InputReaderConfiguration::Change::DEVICE_TYPE /*changes*/);



    // Check whether device type update was successful.

    ASSERT_EQ(AINPUT_SOURCE_TOUCH_NAVIGATION, mDevice->getSources());

    ASSERT_EQ(AINPUT_SOURCE_TOUCH_NAVIGATION | AINPUT_SOURCE_TOUCHPAD, mDevice->getSources());

}



TEST_F(SingleTouchInputMapperTest, HoverEventsOutsidePhysicalFrameAreIgnored) {