diff options
| author | 2022-06-04 00:47:24 +0000 | |
|---|---|---|
| committer | 2022-06-04 00:47:24 +0000 | |
| commit | 0e2943e39749d2084afd89db97c671b156a735f8 (patch) | |
| tree | 40665a46b233d911339a9f417c23ab330915e43d | |
| parent | 513a9dcc743e46f459db5266e572e4880031bf32 (diff) | |
| parent | d9543bc701cc8bc4c10db75c0c3afbcfc8183dd7 (diff) | |
Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc701
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659181
Change-Id: I6093ae0c7c31677d6559c63aa02d073089aec8ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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(); } |