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

Commit cad85079 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... 

Merge "Remove viewport display ID assignment in pointer mode" am: b62f9e45 am: ccbd11bb am: 3525bf87 am: 58152388

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

Change-Id: Ib22b06b90a00ea866c5d3839378b5bb335fbf9b9
parents da4f3515 58152388

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+1 −2
Original line number Diff line number Diff line
@@ -3397,7 +3397,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);
@@ -3407,7 +3406,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;