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

Commit 06df86c7 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: I9712d721a4e16a9639a7042e5b0cb81215a49b4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bb12a75 0e2943e3

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

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

                    .setContainerLayer()

                    .setName("Drag and Drop Input Consumer")

                    .setName("Drag and Drop Input Consumer")

                    .setCallsite("DragState.showInputSurface")

                    .setCallsite("DragState.showInputSurface")

                    .setParent(mDisplayContent.getOverlayLayer())

                    .build();

                    .build();

        }

        }

        final InputWindowHandle h = getInputWindowHandle();

        final InputWindowHandle h = getInputWindowHandle();

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

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

                    .setContainerLayer()

                    .setName("Drag and Drop Input Consumer")

                    .setName("Drag and Drop Input Consumer")

                    .setCallsite("TaskPositioningController.showInputSurface")

                    .setCallsite("TaskPositioningController.showInputSurface")

                    .setParent(dc.getOverlayLayer())

                    .build();

                    .build();

        }

        }