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

Commit 96fb6c70 authored by Chris Ye's avatar Chris Ye Committed by Automerger Merge Worker
Browse files

Populate RELATIVE_X and RELATIVE_Y motion range for touchpad pointer capture... 

Populate RELATIVE_X and RELATIVE_Y motion range for touchpad pointer capture mode. am: 1fb45302 am: 8ed0e785

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1447899

Change-Id: I2aef5583b7e1d6cdfb217c0ac53e6adc7cbf944a
parents 5418a03d 8ed0e785

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+13 −0
Original line number Diff line number Diff line
@@ -190,6 +190,19 @@ void TouchInputMapper::populateDeviceInfo(InputDeviceInfo* info) { 
        info->addMotionRange(mOrientedRanges.y);

        info->addMotionRange(mOrientedRanges.pressure);



        if (mDeviceMode == DeviceMode::UNSCALED && mSource == AINPUT_SOURCE_TOUCHPAD) {

            // Populate RELATIVE_X and RELATIVE_Y motion range for touchpad capture mode

            // RELATIVE_X and RELATIVE_Y motion range is the largest possible hardware relative

            // motion, e.g. the hardware size finger moved completely across the touchpad in one

            // sample cycle.

            const InputDeviceInfo::MotionRange& x = mOrientedRanges.x;

            const InputDeviceInfo::MotionRange& y = mOrientedRanges.y;

            info->addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_X, mSource, -x.max, x.max, x.flat,

                                 x.fuzz, x.resolution);

            info->addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_Y, mSource, -y.max, y.max, y.flat,

                                 y.fuzz, y.resolution);

        }



        if (mOrientedRanges.haveSize) {

            info->addMotionRange(mOrientedRanges.size);

        }

services/inputflinger/tests/InputReader_test.cpp

+14 −0
Original line number Diff line number Diff line
@@ -7554,6 +7554,20 @@ TEST_F(MultiTouchInputMapperTest, Process_TouchpadCapture) { 
    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyDeviceResetWasCalled(&resetArgs));

    ASSERT_EQ(AINPUT_SOURCE_TOUCHPAD, mapper.getSources());



    InputDeviceInfo deviceInfo;

    mDevice->getDeviceInfo(&deviceInfo);



    const InputDeviceInfo::MotionRange* relRangeX =

            deviceInfo.getMotionRange(AMOTION_EVENT_AXIS_RELATIVE_X, AINPUT_SOURCE_TOUCHPAD);

    ASSERT_NE(relRangeX, nullptr);

    ASSERT_EQ(relRangeX->min, -(RAW_X_MAX - RAW_X_MIN));

    ASSERT_EQ(relRangeX->max, RAW_X_MAX - RAW_X_MIN);

    const InputDeviceInfo::MotionRange* relRangeY =

            deviceInfo.getMotionRange(AMOTION_EVENT_AXIS_RELATIVE_Y, AINPUT_SOURCE_TOUCHPAD);

    ASSERT_NE(relRangeY, nullptr);

    ASSERT_EQ(relRangeY->min, -(RAW_Y_MAX - RAW_Y_MIN));

    ASSERT_EQ(relRangeY->max, RAW_Y_MAX - RAW_Y_MIN);



    // run captured pointer tests - note that this is unscaled, so input listener events should be

    //                              identical to what the hardware sends (accounting for any

    //                              calibration).