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

am 6acca244: Merge "Cannot double tap and hold outside of the input focused window." into jb-dev

Browse Source 
* commit '6acca2442572a28b7d9428e5e2fc2aa4271e29f9':
  Cannot double tap and hold outside of the input focused window.
This commit is contained in:
Svetoslav Ganov
2012-06-01 19:01:40 -07:00
committed by Android Git Automerger
parent 3522225dba 6acca24425
commit b6001195f3
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
services/java/com/android/server/accessibility/TouchExplorer.java
View File

@@ -1247,25 +1247,45 @@ public class TouchExplorer {
@Override
public void run() {
final int pointerIndex = mEvent.getActionIndex();
// If the last touched explored location is not within the focused
// window we will long press at that exact spot, otherwise we find the
// accessibility focus and if the tap is within its bounds we long press
// there, otherwise we pick the middle of the focus rectangle.
MotionEvent lastEvent = mInjectedPointerTracker.getLastInjectedHoverEvent();
if (lastEvent == null) {
return;
}
final int exploreLocationX = (int) lastEvent.getX(lastEvent.getActionIndex());
final int exploreLocationY = (int) lastEvent.getY(lastEvent.getActionIndex());
Rect bounds = mTempRect;
boolean useFocusedBounds = false;
final int pointerId = mEvent.getPointerId(mEvent.getActionIndex());
final int pointerIndex = mEvent.findPointerIndex(pointerId);
if (mAms.getAccessibilityFocusBounds(exploreLocationX, exploreLocationY, bounds)) {
// If the user's last touch explored location is not
// within the accessibility focus bounds we use the center
// of the accessibility focused rectangle.
if (!bounds.contains((int) mEvent.getX(pointerIndex),
(int) mEvent.getY(pointerIndex))) {
useFocusedBounds = true;
}
}
mLongPressingPointerId = mEvent.getPointerId(pointerIndex);
final int eventX = (int) mEvent.getX(pointerIndex);
final int eventY = (int) mEvent.getY(pointerIndex);
Rect bounds = mTempRect;
if (mAms.getAccessibilityFocusBounds(eventX, eventY, bounds)
&& !bounds.contains(eventX, eventY)) {
mLongPressingPointerId = mEvent.getPointerId(pointerIndex);
if (useFocusedBounds) {
mLongPressingPointerDeltaX = eventX - bounds.centerX();
mLongPressingPointerDeltaY = eventY - bounds.centerY();
} else {
mLongPressingPointerId = -1;
mLongPressingPointerDeltaX = 0;
mLongPressingPointerDeltaY = 0;
mLongPressingPointerDeltaX = eventX - exploreLocationX;
mLongPressingPointerDeltaY = eventY - exploreLocationY;
}
// We are sending events so send exit and gesture
// end since we transition to another state.
final int pointerId = mReceivedPointerTracker.getPrimaryActivePointerId();
final int pointerIdBits = (1 << pointerId);
mAms.touchExplorationGestureEnded();
sendExitEventsIfNeeded(mPolicyFlags);
mCurrentState = STATE_DELEGATING;