diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-08 13:02:55 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-09-08 13:02:55 -0700 |
| commit | b380c4d7edc158788a85c906900232675c0164ac (patch) | |
| tree | 579f4e6e8cd611c0f95302e0e53b6739b2e4d84e /libs/ui/InputReader.cpp | |
| parent | 35dc79da11639117aab34d3278a7ae90984c0f87 (diff) | |
| parent | a05088c18d22f822e78e7b91d60f518dc3dc06fc (diff) | |
| download | frameworks_base-b380c4d7edc158788a85c906900232675c0164ac.zip frameworks_base-b380c4d7edc158788a85c906900232675c0164ac.tar.gz frameworks_base-b380c4d7edc158788a85c906900232675c0164ac.tar.bz2 | |
resolved conflicts for merge of a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
Diffstat (limited to 'libs/ui/InputReader.cpp')
| -rw-r--r-- | libs/ui/InputReader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp index 8ffb48d..d57b38c 100644 --- a/libs/ui/InputReader.cpp +++ b/libs/ui/InputReader.cpp @@ -1153,7 +1153,7 @@ void TrackballInputMapper::applyPolicyAndDispatch(nsecs_t when, int32_t motionEv int32_t pointerId = 0; getDispatcher()->notifyMotion(when, getDeviceId(), AINPUT_SOURCE_TRACKBALL, policyFlags, - motionEventAction, metaState, AMOTION_EVENT_EDGE_FLAG_NONE, + motionEventAction, 0, metaState, AMOTION_EVENT_EDGE_FLAG_NONE, 1, & pointerId, pointerCoords, mXPrecision, mYPrecision, downTime); } @@ -2324,7 +2324,7 @@ void TouchInputMapper::dispatchTouch(nsecs_t when, uint32_t policyFlags, } // release lock getDispatcher()->notifyMotion(when, getDeviceId(), AINPUT_SOURCE_TOUCHSCREEN, policyFlags, - motionEventAction, getContext()->getGlobalMetaState(), motionEventEdgeFlags, + motionEventAction, 0, getContext()->getGlobalMetaState(), motionEventEdgeFlags, pointerCount, pointerIds, pointerCoords, xPrecision, yPrecision, mDownTime); } |