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

Commit df154bb7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix drag and drop and resize freeform window broken on secondary... 

Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc7 am: 0e2943e3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659181



Change-Id: I515cd275c7248925815d763210d6f0aab1bb695d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d37d1b08 0e2943e3

services/core/java/com/android/server/wm/DragState.java

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ class DragState { 
                    .setContainerLayer()

                    .setName("Drag and Drop Input Consumer")

                    .setCallsite("DragState.showInputSurface")

                    .setParent(mDisplayContent.getOverlayLayer())

                    .build();

        }

        final InputWindowHandle h = getInputWindowHandle();

services/core/java/com/android/server/wm/TaskPositioningController.java

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ class TaskPositioningController { 
                    .setContainerLayer()

                    .setName("Drag and Drop Input Consumer")

                    .setCallsite("TaskPositioningController.showInputSurface")

                    .setParent(dc.getOverlayLayer())

                    .build();

        }