Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d0078ea authored by Minche Li's avatar Minche Li Committed by android-build-merger
Browse files

Merge "Adjust event location when two-finger dragging in TouchExplorer" into qt-dev am: 8bfe7fd3 

am: cbfd4a8f

Change-Id: I4724284d5c824f31ff35789780ecf99fdc651494
parents 6a566510 cbfd4a8f

services/accessibility/java/com/android/server/accessibility/TouchExplorer.java

+8 −3
Original line number Diff line number Diff line
@@ -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.