drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread

Browse Source 
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp

* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
  Fix pointer index when splitting secondary pointers.
This commit is contained in:
Jeff Brown
2010-09-27 21:00:44 -07:00
committed by Android Git Automerger
parent 1738252a59 9c37447e5c
commit 26d5786fb1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ui/InputDispatcher.cpp
View File

@ -1916,6 +1916,14 @@ InputDispatcher::splitMotionEvent(const MotionEntry* originalMotionEntry, BitSet
// The first/last pointer went down/up. // The first/last pointer went down/up.
action = maskedAction == AMOTION_EVENT_ACTION_POINTER_DOWN action = maskedAction == AMOTION_EVENT_ACTION_POINTER_DOWN
? AMOTION_EVENT_ACTION_DOWN : AMOTION_EVENT_ACTION_UP; ? AMOTION_EVENT_ACTION_DOWN : AMOTION_EVENT_ACTION_UP;
} else {
// A secondary pointer went down/up.
uint32_t splitPointerIndex = 0;
while (pointerId != splitPointerIds[splitPointerIndex]) {
splitPointerIndex += 1;
}
action = maskedAction | (splitPointerIndex
<< AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT);
} }
} else { } else {
// An unrelated pointer changed. // An unrelated pointer changed.