commit 2ba3e80f942d35695310f8dde8c16d9687447e47
author Dianne Hackborn <hackbod@google.com> Wed May 11 10:59:54 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Wed May 11 10:59:54 2011 -0700
tree 2bd575b860b214f5b5cd2cf19e25abb6dc066e6b
parent 2bb51bb203c117649db10ad8bd497f199ca797b0
parent 037b54cf3c85a41087f8346dd66cd426b132d899

resolved conflicts for merge of 037b54cf to master

Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a

services/input/InputDispatcher.cpp

diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index d97a9be..5bca7ee 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -2027,6 +2027,14 @@
             // 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) {