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

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

Merge "Remove viewport display ID assignment in pointer mode" am: b62f9e45 

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

Change-Id: I85a16b1aa60ab39e8ec9b32aff9b65ebea1aec21
parents d296d7c9 b62f9e45

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+1 −2
Original line number Diff line number Diff line
@@ -3433,7 +3433,6 @@ void TouchInputMapper::abortPointerMouse(nsecs_t when, uint32_t policyFlags) { 
void TouchInputMapper::dispatchPointerSimple(nsecs_t when, uint32_t policyFlags, bool down,

                                             bool hovering) {

    int32_t metaState = getContext()->getGlobalMetaState();

    int32_t displayId = mViewport.displayId;



    if (down || hovering) {

        mPointerController->setPresentation(PointerControllerInterface::Presentation::POINTER);
@@ -3443,7 +3442,7 @@ void TouchInputMapper::dispatchPointerSimple(nsecs_t when, uint32_t policyFlags, 
    } else if (!down && !hovering && (mPointerSimple.down || mPointerSimple.hovering)) {

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

    }

    displayId = mPointerController->getDisplayId();

    int32_t displayId = mPointerController->getDisplayId();



    float xCursorPosition;

    float yCursorPosition;