Merge "Fix wrong coordinate for DRAG_STARTED" into sc-qpr1-dev

2021-09-15 00:53:18 +00:00
parent 9f3c901311 c2f08d83da
commit e0cc463e33
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -464,7 +464,8 @@ class DragState {
        if (mDragInProgress && isValidDropTarget(newWin, containsAppExtras, interceptsGlobalDrag)) {
            // Only allow the extras to be dispatched to a global-intercepting drag target
            ClipData data = interceptsGlobalDrag ? mData.copyForTransferWithActivityInfo() : null;
-            DragEvent event = obtainDragEvent(DragEvent.ACTION_DRAG_STARTED, touchX, touchY,
+            DragEvent event = obtainDragEvent(DragEvent.ACTION_DRAG_STARTED,
+                    newWin.translateToWindowX(touchX), newWin.translateToWindowY(touchY),
                    data, false /* includeDragSurface */,
                    null /* dragAndDropPermission */);
            try {