Merge changes from topic "DW_WINDOW_DRAG" into main (0adfd5f3) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.wm.shell.windowdecor;

		import static android.view.WindowManager.TRANSIT_CHANGE;

		import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_DRAG_WINDOW;
		import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_RESIZE_WINDOW;

		import android.graphics.Point;
		@@ -103,6 +104,9 @@ 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);
		@@ -157,11 +161,16 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback,
		}
		mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_RESIZE_WINDOW);
		} else {
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		DragPositioningCallbackUtility.updateTaskBounds(mRepositionTaskBounds,
		mTaskBoundsAtDragStart, mRepositionStartPoint, x, y);
		if (!mTaskBoundsAtDragStart.equals(mRepositionTaskBounds)) {
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		wct.setBounds(mDesktopWindowDecoration.mTaskInfo.token, mRepositionTaskBounds);
		mTransitions.startTransition(TRANSIT_CHANGE, wct, this);
		} else {
		// Drag-move ended where it originally started, no need to update WM.
		mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_DRAG_WINDOW);
		}
		}

		mCtrlType = CTRL_TYPE_UNDEFINED;
		@@ -202,6 +211,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback,
		mCtrlType = CTRL_TYPE_UNDEFINED;
		finishCallback.onTransitionFinished(null);
		mIsResizingOrAnimatingResize = false;
		mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_DRAG_WINDOW);
		return true;
		}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowMultiWindow.kt

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.flicker.service.desktopmode.scenarios

		import com.android.server.wm.flicker.helpers.DesktopModeAppHelper
		import com.android.server.wm.flicker.helpers.ImeAppHelper
		import com.android.server.wm.flicker.helpers.MailAppHelper
		import com.android.server.wm.flicker.helpers.NewTasksAppHelper
		import com.android.server.wm.flicker.helpers.SimpleAppHelper
		import com.android.window.flags.Flags
		import org.junit.After
		import org.junit.Assume
		import org.junit.Before
		import org.junit.Ignore
		import org.junit.Test

		/** Base scenario test for window drag CUJ with multiple windows. */
		@Ignore("Base Test Class")
		abstract class DragAppWindowMultiWindow : DragAppWindowScenarioTestBase()
		{
		private val imeAppHelper = ImeAppHelper(instrumentation)
		private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))
		private val mailApp = DesktopModeAppHelper(MailAppHelper(instrumentation))
		private val newTasksApp = DesktopModeAppHelper(NewTasksAppHelper(instrumentation))
		private val imeApp = DesktopModeAppHelper(ImeAppHelper(instrumentation))

		@Before
		fun setup() {
		Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)
		testApp.enterDesktopWithDrag(wmHelper, device)
		mailApp.launchViaIntent(wmHelper)
		newTasksApp.launchViaIntent(wmHelper)
		imeApp.launchViaIntent(wmHelper)
		}

		@Test
		override fun dragAppWindow() {
		val (startXIme, startYIme) = getWindowDragStartCoordinate(imeAppHelper)

		imeApp.dragWindow(startXIme, startYIme,
		endX = startXIme + 150, endY = startYIme + 150,
		wmHelper, device)
		}

		@After
		fun teardown() {
		testApp.exit(wmHelper)
		mailApp.exit(wmHelper)
		newTasksApp.exit(wmHelper)
		imeApp.exit(wmHelper)
		}
		}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowScenarioTestBase.kt

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.flicker.service.desktopmode.scenarios

		import android.app.Instrumentation
		import android.tools.NavBar
		import android.tools.Rotation
		import android.tools.device.apphelpers.StandardAppHelper
		import android.tools.traces.parsers.WindowManagerStateHelper
		import androidx.test.platform.app.InstrumentationRegistry
		import androidx.test.uiautomator.UiDevice
		import com.android.launcher3.tapl.LauncherInstrumentation
		import com.android.wm.shell.flicker.service.common.Utils
		import org.junit.Ignore
		import org.junit.Rule
		import org.junit.Test

		/** Base test class for window drag CUJ. */
		@Ignore("Base Test Class")
		abstract class DragAppWindowScenarioTestBase {

		val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		val tapl = LauncherInstrumentation()
		val wmHelper = WindowManagerStateHelper(instrumentation)
		val device = UiDevice.getInstance(instrumentation)

		@Rule
		@JvmField
		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)

		@Test abstract fun dragAppWindow()

		/** Return the top-center coordinate of the app header as the start coordinate. */
		fun getWindowDragStartCoordinate(appHelper: StandardAppHelper): Pair<Int, Int> {
		val windowRect = wmHelper.getWindowRegion(appHelper).bounds
		// Set start x-coordinate as center of app header.
		val startX = windowRect.centerX()
		val startY = windowRect.top
		return Pair(startX, startY)
		}
		}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowSingleWindow.kt

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.flicker.service.desktopmode.scenarios

		import com.android.server.wm.flicker.helpers.DesktopModeAppHelper
		import com.android.server.wm.flicker.helpers.SimpleAppHelper
		import com.android.window.flags.Flags
		import org.junit.After
		import org.junit.Assume
		import org.junit.Before
		import org.junit.Ignore
		import org.junit.Test

		/** Base scenario test for window drag CUJ with single window. */
		@Ignore("Base Test Class")
		abstract class DragAppWindowSingleWindow : DragAppWindowScenarioTestBase()
		{
		private val simpleAppHelper = SimpleAppHelper(instrumentation)
		private val testApp = DesktopModeAppHelper(simpleAppHelper)

		@Before
		fun setup() {
		Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)
		testApp.enterDesktopWithDrag(wmHelper, device)
		}

		@Test
		override fun dragAppWindow() {
		val (startXTest, startYTest) = getWindowDragStartCoordinate(simpleAppHelper)
		testApp.dragWindow(startXTest, startYTest,
		endX = startXTest + 150, endY = startYTest + 150,
		wmHelper, device)
		}

		@After
		fun teardown() {
		testApp.exit(wmHelper)
		}
		}

tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt

+12 −2

Original line number	Diff line number	Diff line
		@@ -147,7 +147,17 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) :
		val endX = startX + horizontalChange

		// drag the specified corner of the window to the end coordinate.
		device.drag(startX, startY, endX, endY, 100)
		dragWindow(startX, startY, endX, endY, wmHelper, device)
		}

		/** Drag a window from a source coordinate to a destination coordinate. */
		fun dragWindow(
		startX: Int, startY: Int,
		endX: Int, endY: Int,
		wmHelper: WindowManagerStateHelper,
		device: UiDevice
		) {
		device.drag(startX, startY, endX, endY, /* steps= */ 100)
		wmHelper
		.StateSyncBuilder()
		.withAppTransitionIdle()