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

Commit 652dbb7d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2 

* commit '837bdc49':
  Fix scaling of batched motion events.
parents e4e8dffd 837bdc49

services/input/InputDispatcher.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1888,6 +1888,14 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, 
        // Append additional motion samples.

        MotionSample* nextMotionSample = firstMotionSample->next;

        for (; nextMotionSample != NULL; nextMotionSample = nextMotionSample->next) {

            if ((motionEntry->source & AINPUT_SOURCE_CLASS_POINTER) != 0 && scaleFactor != 1.0f) {

                for (size_t i = 0; i < motionEntry->pointerCount; i++) {

                    scaledCoords[i] = nextMotionSample->pointerCoords[i];

                    scaledCoords[i].scale(scaleFactor);

                }

            } else {

                usingCoords = nextMotionSample->pointerCoords;

            }

            status = connection->inputPublisher.appendMotionSample(

                    nextMotionSample->eventTime, usingCoords);

            if (status == NO_MEMORY) {