Merge "Log a proper event when drag-to-maximize" into main (d4eefb49) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeEventLogger.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -594,6 +594,10 @@ class DesktopModeEventLogger {
		FrameworkStatsLog
		.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__MAXIMIZE_MENU_RESIZE_TRIGGER
		),
		DRAG_TO_TOP_RESIZE_TRIGGER(
		FrameworkStatsLog
		.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__DRAG_TO_TOP_RESIZE_TRIGGER
		),
		}

		/**

+2 −3

Original line number	Diff line number	Diff line
		@@ -871,11 +871,10 @@ class DesktopTasksController(
		return
		}

		// TODO(b/375356605): Introduce a new ResizeTrigger for drag-to-top.
		desktopModeEventLogger.logTaskResizingStarted(
		ResizeTrigger.UNKNOWN_RESIZE_TRIGGER, motionEvent, taskInfo, displayController
		ResizeTrigger.DRAG_TO_TOP_RESIZE_TRIGGER, motionEvent, taskInfo, displayController
		)
		toggleDesktopTaskSize(taskInfo, ResizeTrigger.UNKNOWN_RESIZE_TRIGGER, motionEvent)
		toggleDesktopTaskSize(taskInfo, ResizeTrigger.DRAG_TO_TOP_RESIZE_TRIGGER, motionEvent)
		}

		private fun getMaximizeBounds(taskInfo: RunningTaskInfo, stableBounds: Rect): Rect {

+22 −0

Original line number	Diff line number	Diff line
		@@ -3038,6 +3038,21 @@ class DesktopTasksControllerTest : ShellTestCase() {
		// Assert bounds set to stable bounds
		val wct = getLatestToggleResizeDesktopTaskWct()
		assertThat(findBoundsChange(wct, task)).isEqualTo(STABLE_BOUNDS)
		// Assert event is properly logged
		verify(desktopModeEventLogger, times(1)).logTaskResizingStarted(
		ResizeTrigger.DRAG_TO_TOP_RESIZE_TRIGGER,
		motionEvent,
		task,
		displayController
		)
		verify(desktopModeEventLogger, times(1)).logTaskResizingEnded(
		ResizeTrigger.DRAG_TO_TOP_RESIZE_TRIGGER,
		motionEvent,
		task,
		STABLE_BOUNDS.height(),
		STABLE_BOUNDS.width(),
		displayController
		)
		}

		@Test
		@@ -3082,6 +3097,13 @@ class DesktopTasksControllerTest : ShellTestCase() {
		eq(STABLE_BOUNDS),
		anyOrNull(),
		)
		// Assert no event is logged
		verify(desktopModeEventLogger, never()).logTaskResizingStarted(
		any(), any(), any(), any(), any()
		)
		verify(desktopModeEventLogger, never()).logTaskResizingEnded(
		any(), any(), any(), any(), any(), any(), any()
		)
		}

		@Test