ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev

Browse Source
This commit is contained in:
Michael Wright 2015-09-23 13:18:26 +00:00 committed by Android (Google) Code Review
commit ce92ce9bef
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
services/inputflinger/InputReader.cpp
View File

@ -3860,6 +3860,7 @@ void TouchInputMapper::reset(nsecs_t when) {
mPointerUsage = POINTER_USAGE_NONE; mPointerUsage = POINTER_USAGE_NONE;
mSentHoverEnter = false; mSentHoverEnter = false;
mHavePointerIds = false; mHavePointerIds = false;
mCurrentMotionAborted = false;
mDownTime = 0; mDownTime = 0;
mCurrentVirtualKey.down = false; mCurrentVirtualKey.down = false;
@ -4087,11 +4088,17 @@ void TouchInputMapper::cookAndDispatch(nsecs_t when) {
mCurrentCookedState.cookedPointerData.touchingIdBits); mCurrentCookedState.cookedPointerData.touchingIdBits);
} }
dispatchButtonRelease(when, policyFlags); if (!mCurrentMotionAborted) {
dispatchHoverExit(when, policyFlags); dispatchButtonRelease(when, policyFlags);
dispatchTouches(when, policyFlags); dispatchHoverExit(when, policyFlags);
dispatchHoverEnterAndMove(when, policyFlags); dispatchTouches(when, policyFlags);
dispatchButtonPress(when, policyFlags); dispatchHoverEnterAndMove(when, policyFlags);
dispatchButtonPress(when, policyFlags);
}
if (mCurrentCookedState.cookedPointerData.pointerCount == 0) {
mCurrentMotionAborted = false;
}
} }
// Synthesize key up from raw buttons if needed. // Synthesize key up from raw buttons if needed.
@ -4316,6 +4323,22 @@ void TouchInputMapper::dispatchVirtualKey(nsecs_t when, uint32_t policyFlags,
getListener()->notifyKey(&args); getListener()->notifyKey(&args);
} }
void TouchInputMapper::abortTouches(nsecs_t when, uint32_t policyFlags) {
BitSet32 currentIdBits = mCurrentCookedState.cookedPointerData.touchingIdBits;
if (!currentIdBits.isEmpty()) {
int32_t metaState = getContext()->getGlobalMetaState();
int32_t buttonState = mCurrentCookedState.buttonState;
dispatchMotion(when, policyFlags, mSource, AMOTION_EVENT_ACTION_CANCEL, 0, 0,
metaState, buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,
mCurrentCookedState.cookedPointerData.pointerProperties,
mCurrentCookedState.cookedPointerData.pointerCoords,
mCurrentCookedState.cookedPointerData.idToIndex,
currentIdBits, -1,
mOrientedXPrecision, mOrientedYPrecision, mDownTime);
mCurrentMotionAborted = true;
}
}
void TouchInputMapper::dispatchTouches(nsecs_t when, uint32_t policyFlags) { void TouchInputMapper::dispatchTouches(nsecs_t when, uint32_t policyFlags) {
BitSet32 currentIdBits = mCurrentCookedState.cookedPointerData.touchingIdBits; BitSet32 currentIdBits = mCurrentCookedState.cookedPointerData.touchingIdBits;
BitSet32 lastIdBits = mLastCookedState.cookedPointerData.touchingIdBits; BitSet32 lastIdBits = mLastCookedState.cookedPointerData.touchingIdBits;
@ -6089,6 +6112,7 @@ void TouchInputMapper::fadePointer() {
void TouchInputMapper::cancelTouch(nsecs_t when) { void TouchInputMapper::cancelTouch(nsecs_t when) {
abortPointerUsage(when, 0 /*policyFlags*/); abortPointerUsage(when, 0 /*policyFlags*/);
abortTouches(when, 0 /* policyFlags*/);
} }
bool TouchInputMapper::isPointInsideSurface(int32_t x, int32_t y) { bool TouchInputMapper::isPointInsideSurface(int32_t x, int32_t y) {

4
services/inputflinger/InputReader.h
View File

@ -1469,6 +1469,9 @@ protected:
// Have we assigned pointer IDs for this stream // Have we assigned pointer IDs for this stream
bool mHavePointerIds; bool mHavePointerIds;
// Is the current stream of direct touch events aborted
bool mCurrentMotionAborted;
// The time the primary pointer last went down. // The time the primary pointer last went down.
nsecs_t mDownTime; nsecs_t mDownTime;
@ -1802,6 +1805,7 @@ private:
void dispatchButtonPress(nsecs_t when, uint32_t policyFlags); void dispatchButtonPress(nsecs_t when, uint32_t policyFlags);
const BitSet32& findActiveIdBits(const CookedPointerData& cookedPointerData); const BitSet32& findActiveIdBits(const CookedPointerData& cookedPointerData);
void cookPointerData(); void cookPointerData();
void abortTouches(nsecs_t when, uint32_t policyFlags);
void dispatchPointerUsage(nsecs_t when, uint32_t policyFlags, PointerUsage pointerUsage); void dispatchPointerUsage(nsecs_t when, uint32_t policyFlags, PointerUsage pointerUsage);
void abortPointerUsage(nsecs_t when, uint32_t policyFlags); void abortPointerUsage(nsecs_t when, uint32_t policyFlags);