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

Commit ba6f333c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Touchpad Capture: Fix issues with Pointer Controller" am: 4aaa3105 am: e0aa154f 

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

Change-Id: Ice321764974d67738fd6e99e50aba670ea766f66
parents 93ba79f6 e0aa154f

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -781,12 +781,17 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { 
        mOrientedRanges.clear();

        mOrientedRanges.clear();

    }

    }





    // Create pointer controller if needed.

    // Create pointer controller if needed, and keep it around if Pointer Capture is enabled to

    // preserve the cursor position.

    if (mDeviceMode == DeviceMode::POINTER ||

    if (mDeviceMode == DeviceMode::POINTER ||

        (mDeviceMode == DeviceMode::DIRECT && mConfig.showTouches)) {

        (mDeviceMode == DeviceMode::DIRECT && mConfig.showTouches) ||

        (mParameters.deviceType == Parameters::DeviceType::POINTER && mConfig.pointerCapture)) {

        if (mPointerController == nullptr) {

        if (mPointerController == nullptr) {

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

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

        }

        }

        if (mConfig.pointerCapture) {

            mPointerController->fade(PointerControllerInterface::Transition::IMMEDIATE);

        }

    } else {

    } else {

        mPointerController.reset();

        mPointerController.reset();

    }

    }