Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change InputMessage.motion.pointerSize to a uint32_t."

Browse Source
This commit is contained in:
Narayan Kamath
2014-05-16 12:06:09 +00:00
committed by Gerrit Code Review
parent 402120a223 844a4c81ff
commit 8a196c0676
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/input/InputDispatcher.cpp
View File

@@ -1968,7 +1968,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime,
xOffset = dispatchEntry->xOffset * scaleFactor; xOffset = dispatchEntry->xOffset * scaleFactor;
yOffset = dispatchEntry->yOffset * scaleFactor; yOffset = dispatchEntry->yOffset * scaleFactor;
if (scaleFactor != 1.0f) { if (scaleFactor != 1.0f) {
for (size_t i = 0; i < motionEntry->pointerCount; i++) { for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
scaledCoords[i] = motionEntry->pointerCoords[i]; scaledCoords[i] = motionEntry->pointerCoords[i];
scaledCoords[i].scale(scaleFactor); scaledCoords[i].scale(scaleFactor);
} }
@@ -1981,7 +1981,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime,
// We don't want the dispatch target to know. // We don't want the dispatch target to know.
if (dispatchEntry->targetFlags & InputTarget::FLAG_ZERO_COORDS) { if (dispatchEntry->targetFlags & InputTarget::FLAG_ZERO_COORDS) {
for (size_t i = 0; i < motionEntry->pointerCount; i++) { for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
scaledCoords[i].clear(); scaledCoords[i].clear();
} }
usingCoords = scaledCoords; usingCoords = scaledCoords;