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

Merge "Adjust event location when two-finger dragging in TouchExplorer" into qt-dev

Browse Source
This commit is contained in:
Minche Li
2019-04-29 02:09:17 +00:00
committed by Android (Google) Code Review
parent 1cff26a707 b7507a9997
commit 8bfe7fd32c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,12 +703,17 @@ class TouchExplorer extends BaseEventStreamTransformation
final float secondPtrX = event.getX(1);
final float secondPtrY = event.getY(1);
final float deltaX = firstPtrX - secondPtrX;
final float deltaY = firstPtrY - secondPtrY;
final int pointerIndex = event.findPointerIndex(mDraggingPointerId);
final float deltaX =
(pointerIndex == 0) ? (secondPtrX - firstPtrX)
: (firstPtrX - secondPtrX);
final float deltaY =
(pointerIndex == 0) ? (secondPtrY - firstPtrY)
: (firstPtrY - secondPtrY);
final double distance = Math.hypot(deltaX, deltaY);
if (distance > mScaledMinPointerDistanceToUseMiddleLocation) {
event.setLocation(deltaX / 2, deltaY / 2);
event.offsetLocation(deltaX / 2, deltaY / 2);
}
// If still dragging send a drag event.