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

Commit 9cf8f32c authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Include SOURCE_TOUCHPAD for Virtual Navigation Touchpad 

In addition to the existing SOURCE_TOUCH_NAVIGATION, this change
includes SOURCE_TOUCHPAD to the InputDevice and the events for a Virtual
Navigation Touchpad.

Navigation touchpad events should not be affected by the geometry of the
window that receives the events, since they are focus events (as opposed
to pointer events). Adding SOURCE_TOUCHPAD will also add
SOURCE_CLASS_POSITION, which will make the event ignore any local
transforms.

Bug: 343963635
Test: atest inputflinger_tests
Flag: NONE bug fix
Change-Id: I8faefbce0a50377f9e46dbfa419900a00473c262
parent 3cd662b3

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) {