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

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

Merge "Set cursor position to the first pointer for mouse events" into udc-dev am: 585bc663 

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



Change-Id: I6919d2045f1bfbadf4550ff323d20f19dd51ce14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 850c2d01 585bc663

services/inputflinger/tests/InputDispatcher_test.cpp

+2 −4
Original line number Diff line number Diff line
@@ -1564,8 +1564,7 @@ public: 


        // Set mouse cursor position for the most common cases to avoid boilerplate.

        if (mSource == AINPUT_SOURCE_MOUSE &&

            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition) &&

            mPointers.size() == 1) {

            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition)) {

            mRawXCursorPosition = pointerCoords[0].getX();

            mRawYCursorPosition = pointerCoords[0].getY();

        }
@@ -1677,8 +1676,7 @@ public: 


        // Set mouse cursor position for the most common cases to avoid boilerplate.

        if (mSource == AINPUT_SOURCE_MOUSE &&

            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition) &&

            mPointers.size() == 1) {

            !MotionEvent::isValidCursorPosition(mRawXCursorPosition, mRawYCursorPosition)) {

            mRawXCursorPosition = pointerCoords[0].getX();

            mRawYCursorPosition = pointerCoords[0].getY();

        }