From bb7ab5864837765a41e02bf1f0c11eb20893bb46 Mon Sep 17 00:00:00 2001 From: Vaibhav Devmurari Date: Mon, 6 Jun 2022 10:01:43 +0000 Subject: [PATCH] Make drag window a trusted overlay We added new functionality to pilferPointers API in ag/18234604. Using it we can extend the functionality of drag and drop to allow user to interact with the UI while using 1 pointer/finger to drag. DD: go/global_drag_and_drop Bug: 220109830 Test: atest inputflinger_tests Change-Id: Ieb890ce71c938b4f8c6b0256fe14887b9e3968d1 --- .../core/java/com/android/server/wm/DragState.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java index f2d4d5427291c..475dd17ef727b 100644 --- a/services/core/java/com/android/server/wm/DragState.java +++ b/services/core/java/com/android/server/wm/DragState.java @@ -367,10 +367,15 @@ class DragState { mDragWindowHandle.ownerUid = MY_UID; mDragWindowHandle.scaleFactor = 1.0f; - // Keep the default behavior of this window to be focusable, which allows the system - // to consume keys when dragging is active. This can also be used to modify the drag - // state on key press. For example, cancel drag on escape key. - mDragWindowHandle.inputConfig = InputConfig.PREVENT_SPLITTING; + // InputConfig.PREVENT_SPLITTING: To keep the default behavior of this window to be + // focusable, which allows the system to consume keys when dragging is active. This can + // also be used to modify the drag state on key press. For example, cancel drag on + // escape key. + // InputConfig.TRUSTED_OVERLAY: To not block any touches while D&D ongoing and allowing + // touches to pass through to windows underneath. This allows user to interact with the + // UI to navigate while dragging. + mDragWindowHandle.inputConfig = + InputConfig.PREVENT_SPLITTING | InputConfig.TRUSTED_OVERLAY; // The drag window cannot receive new touches. mDragWindowHandle.touchableRegion.setEmpty();