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

Commit a085bad6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply pointer capture changes only in mode POINTER_RELATIVE" into tm-qpr-dev am: 42b49d78 

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



Change-Id: I9b080a6d1944dad3a0f989819a95624549ed6d11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bd0e646 42b49d78

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+19 −32
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ uint32_t CursorInputMapper::getSources() const { 
void CursorInputMapper::populateDeviceInfo(InputDeviceInfo* info) {

    InputMapper::populateDeviceInfo(info);



    if (mParameters.mode == Parameters::MODE_POINTER) {

    if (mParameters.mode == Parameters::Mode::POINTER) {

        float minX, minY, maxX, maxY;

        if (mPointerController->getBounds(&minX, &minY, &maxX, &maxY)) {

            info->addMotionRange(AMOTION_EVENT_AXIS_X, mSource, minX, maxX, 0.0f, 0.0f, 0.0f);
@@ -131,12 +131,12 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 


        // Configure device mode.

        switch (mParameters.mode) {

            case Parameters::MODE_POINTER_RELATIVE:

            case Parameters::Mode::POINTER_RELATIVE:

                // Should not happen during first time configuration.

                ALOGE("Cannot start a device in MODE_POINTER_RELATIVE, starting in MODE_POINTER");

                mParameters.mode = Parameters::MODE_POINTER;

                mParameters.mode = Parameters::Mode::POINTER;

                [[fallthrough]];

            case Parameters::MODE_POINTER:

            case Parameters::Mode::POINTER:

                mSource = AINPUT_SOURCE_MOUSE;

                mXPrecision = 1.0f;

                mYPrecision = 1.0f;
@@ -144,7 +144,7 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 
                mYScale = 1.0f;

                mPointerController = getContext()->getPointerController(getDeviceId());

                break;

            case Parameters::MODE_NAVIGATION:

            case Parameters::Mode::NAVIGATION:

                mSource = AINPUT_SOURCE_TRACKBALL;

                mXPrecision = TRACKBALL_MOVEMENT_THRESHOLD;

                mYPrecision = TRACKBALL_MOVEMENT_THRESHOLD;
@@ -157,12 +157,13 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 
        mHWheelScale = 1.0f;

    }



    const bool configurePointerCapture = (!changes && config->pointerCaptureRequest.enable) ||

            (changes & InputReaderConfiguration::CHANGE_POINTER_CAPTURE);

    const bool configurePointerCapture = mParameters.mode != Parameters::Mode::NAVIGATION &&

            ((!changes && config->pointerCaptureRequest.enable) ||

             (changes & InputReaderConfiguration::CHANGE_POINTER_CAPTURE));

    if (configurePointerCapture) {

        if (config->pointerCaptureRequest.enable) {

            if (mParameters.mode == Parameters::MODE_POINTER) {

                mParameters.mode = Parameters::MODE_POINTER_RELATIVE;

            if (mParameters.mode == Parameters::Mode::POINTER) {

                mParameters.mode = Parameters::Mode::POINTER_RELATIVE;

                mSource = AINPUT_SOURCE_MOUSE_RELATIVE;

                // Keep PointerController around in order to preserve the pointer position.

                mPointerController->fade(PointerControllerInterface::Transition::IMMEDIATE);
@@ -170,8 +171,8 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 
                ALOGE("Cannot request pointer capture, device is not in MODE_POINTER");

            }

        } else {

            if (mParameters.mode == Parameters::MODE_POINTER_RELATIVE) {

                mParameters.mode = Parameters::MODE_POINTER;

            if (mParameters.mode == Parameters::Mode::POINTER_RELATIVE) {

                mParameters.mode = Parameters::Mode::POINTER;

                mSource = AINPUT_SOURCE_MOUSE;

            } else {

                ALOGE("Cannot release pointer capture, device is not in MODE_POINTER_RELATIVE");
@@ -186,8 +187,8 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 


    if (!changes || (changes & InputReaderConfiguration::CHANGE_POINTER_SPEED) ||

        configurePointerCapture) {

        if (config->pointerCaptureRequest.enable) {

            // Disable any acceleration or scaling when Pointer Capture is enabled.

        if (mParameters.mode == Parameters::Mode::POINTER_RELATIVE) {

            // Disable any acceleration or scaling for the pointer when Pointer Capture is enabled.

            mPointerVelocityControl.setParameters(FLAT_VELOCITY_CONTROL_PARAMS);

            mWheelXVelocityControl.setParameters(FLAT_VELOCITY_CONTROL_PARAMS);

            mWheelYVelocityControl.setParameters(FLAT_VELOCITY_CONTROL_PARAMS);
@@ -221,12 +222,12 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration* 
}



void CursorInputMapper::configureParameters() {

    mParameters.mode = Parameters::MODE_POINTER;

    mParameters.mode = Parameters::Mode::POINTER;

    String8 cursorModeString;

    if (getDeviceContext().getConfiguration().tryGetProperty(String8("cursor.mode"),

                                                             cursorModeString)) {

        if (cursorModeString == "navigation") {

            mParameters.mode = Parameters::MODE_NAVIGATION;

            mParameters.mode = Parameters::Mode::NAVIGATION;

        } else if (cursorModeString != "pointer" && cursorModeString != "default") {

            ALOGW("Invalid value for cursor.mode: '%s'", cursorModeString.string());

        }
@@ -237,7 +238,7 @@ void CursorInputMapper::configureParameters() { 
                                                         mParameters.orientationAware);



    mParameters.hasAssociatedDisplay = false;

    if (mParameters.mode == Parameters::MODE_POINTER || mParameters.orientationAware) {

    if (mParameters.mode == Parameters::Mode::POINTER || mParameters.orientationAware) {

        mParameters.hasAssociatedDisplay = true;

    }

}
@@ -246,21 +247,7 @@ void CursorInputMapper::dumpParameters(std::string& dump) { 
    dump += INDENT3 "Parameters:\n";

    dump += StringPrintf(INDENT4 "HasAssociatedDisplay: %s\n",

                         toString(mParameters.hasAssociatedDisplay));



    switch (mParameters.mode) {

        case Parameters::MODE_POINTER:

            dump += INDENT4 "Mode: pointer\n";

            break;

        case Parameters::MODE_POINTER_RELATIVE:

            dump += INDENT4 "Mode: relative pointer\n";

            break;

        case Parameters::MODE_NAVIGATION:

            dump += INDENT4 "Mode: navigation\n";

            break;

        default:

            ALOG_ASSERT(false);

    }



    dump += StringPrintf(INDENT4 "Mode: %s\n", ftl::enum_string(mParameters.mode).c_str());

    dump += StringPrintf(INDENT4 "OrientationAware: %s\n", toString(mParameters.orientationAware));

}
@@ -486,7 +473,7 @@ int32_t CursorInputMapper::getScanCodeState(uint32_t sourceMask, int32_t scanCod 


std::optional<int32_t> CursorInputMapper::getAssociatedDisplayId() {

    if (mParameters.hasAssociatedDisplay) {

        if (mParameters.mode == Parameters::MODE_POINTER) {

        if (mParameters.mode == Parameters::Mode::POINTER) {

            return std::make_optional(mPointerController->getDisplayId());

        } else {

            // If the device is orientationAware and not a mouse,

services/inputflinger/reader/mapper/CursorInputMapper.h

+11 −4
Original line number Diff line number Diff line
@@ -74,10 +74,17 @@ private: 


    // Immutable configuration parameters.

    struct Parameters {

        enum Mode {

            MODE_POINTER,

            MODE_POINTER_RELATIVE,

            MODE_NAVIGATION,

        enum class Mode {

            // In POINTER mode, the device is a mouse that controls the mouse cursor on the screen,

            // reporting absolute screen locations using SOURCE_MOUSE.

            POINTER,

            // A mouse device in POINTER mode switches to the POINTER_RELATIVE mode when Pointer

            // Capture is enabled, and reports relative values only using SOURCE_MOUSE_RELATIVE.

            POINTER_RELATIVE,

            // A device in NAVIGATION mode emits relative values using SOURCE_TRACKBALL.

            NAVIGATION,



            ftl_last = NAVIGATION,

        };



        Mode mode;