From 907e8be3dd1f1366cc3ab6417bf7249bebe1d8a0 Mon Sep 17 00:00:00 2001 From: Devarshi Bhatt Date: Thu, 22 Aug 2024 04:49:07 +0000 Subject: Move window drag instrumentation to drag position move callback. This ensures that the instrumentation starts only when the window has actually moved. Bug: 360299792 Test: perfetto trace (https://screenshot.googleplex.com/4sXcq7TADdHN4HQ) Flag: NONE instrumentation change Change-Id: Iab767aff4d007f09c39f7583ea3b773ba62f2e27 --- .../android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java index 7f2c1a81d20c..4a884eb50595 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java @@ -104,9 +104,6 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, wct.reorder(mDesktopWindowDecoration.mTaskInfo.token, true); mTaskOrganizer.applyTransaction(wct); } - } else { - mInteractionJankMonitor.begin(mDesktopWindowDecoration.mTaskSurface, - mDesktopWindowDecoration.mContext, CUJ_DESKTOP_MODE_DRAG_WINDOW); } mDragStartListener.onDragStart(mDesktopWindowDecoration.mTaskInfo.taskId); mRepositionTaskBounds.set(mTaskBoundsAtDragStart); @@ -133,6 +130,9 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, mDesktopWindowDecoration.updateResizeVeil(mRepositionTaskBounds); } } else if (mCtrlType == CTRL_TYPE_UNDEFINED) { + // Begin window drag CUJ instrumentation only when drag position moves. + mInteractionJankMonitor.begin(mDesktopWindowDecoration.mTaskSurface, + mDesktopWindowDecoration.mContext, CUJ_DESKTOP_MODE_DRAG_WINDOW); final SurfaceControl.Transaction t = mTransactionSupplier.get(); DragPositioningCallbackUtility.setPositionOnDrag(mDesktopWindowDecoration, mRepositionTaskBounds, mTaskBoundsAtDragStart, mRepositionStartPoint, t, x, y); -- cgit v1.2.3-59-g8ed1b