diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-11 10:59:54 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-11 10:59:54 -0700 |
| commit | 2ba3e80f942d35695310f8dde8c16d9687447e47 (patch) | |
| tree | 2bd575b860b214f5b5cd2cf19e25abb6dc066e6b /services/input | |
| parent | 2bb51bb203c117649db10ad8bd497f199ca797b0 (diff) | |
| parent | 037b54cf3c85a41087f8346dd66cd426b132d899 (diff) | |
| download | frameworks_base-2ba3e80f942d35695310f8dde8c16d9687447e47.zip frameworks_base-2ba3e80f942d35695310f8dde8c16d9687447e47.tar.gz frameworks_base-2ba3e80f942d35695310f8dde8c16d9687447e47.tar.bz2 | |
resolved conflicts for merge of 037b54cf to master
Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a
Diffstat (limited to 'services/input')
| -rw-r--r-- | services/input/InputDispatcher.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ 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) { |