diff options
| author | 2022-06-04 00:28:23 +0000 | |
|---|---|---|
| committer | 2022-06-04 00:28:23 +0000 | |
| commit | d9543bc701cc8bc4c10db75c0c3afbcfc8183dd7 (patch) | |
| tree | b3c3b0554ef54c6b198b0057202a3bff05640a16 | |
| parent | c616d77ca49a046ee64b2b300884d07583e24882 (diff) | |
| parent | 73fef0d6f2dcd1cc51742f2dcb77f91f883824bf (diff) | |
Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/DragState.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskPositioningController.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java index c47d778c60bc..65b1f0233d93 100644 --- a/services/core/java/com/android/server/wm/DragState.java +++ b/services/core/java/com/android/server/wm/DragState.java @@ -165,6 +165,7 @@ class DragState { .setContainerLayer() .setName("Drag and Drop Input Consumer") .setCallsite("DragState.showInputSurface") + .setParent(mDisplayContent.getOverlayLayer()) .build(); } final InputWindowHandle h = getInputWindowHandle(); diff --git a/services/core/java/com/android/server/wm/TaskPositioningController.java b/services/core/java/com/android/server/wm/TaskPositioningController.java index 68bf2b2424e7..6dcad2bb263e 100644 --- a/services/core/java/com/android/server/wm/TaskPositioningController.java +++ b/services/core/java/com/android/server/wm/TaskPositioningController.java @@ -73,6 +73,7 @@ class TaskPositioningController { .setContainerLayer() .setName("Drag and Drop Input Consumer") .setCallsite("TaskPositioningController.showInputSurface") + .setParent(dc.getOverlayLayer()) .build(); } |