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

Commit c86dd3a2 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Log a proper event when drag-to-maximize 

This CL replaces the tentative event for drag-to-maximize with the
proper one, DRAG_TO_TOP_RESIZE_TRIGGER.

Bug: 375356605
Flag: com.android.window.flags.enable_drag_to_maximize
Test: DesktopTasksControllerTest
Change-Id: I9cca0cd5827985168995218437fba9ae0a17a474
parent 03d1207d

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

            ),

        }



        /**

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

+2 −3
Original line number Diff line number Diff line
@@ -883,11 +883,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 {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+22 −0
Original line number Diff line number Diff line
@@ -2987,6 +2987,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
@@ -3031,6 +3046,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