Merge "b/418236025 Remove MaximizeAppWindowWithDragToTopDragZone, tracking the... (98759f79) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppWindowWithDragToTopDragZoneLandscape.kt

deleted100644 → 0

+0 −53

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

		import android.tools.Rotation.ROTATION_90
		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP
		import com.android.wm.shell.scenarios.MaximizeAppWindowWithDragToTopDragZone
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Maximize app window by dragging it to the top drag zone.
		*
		* Assert that the app window keeps the same increases in size, filling the vertical and horizontal
		* stable display bounds.
		*/
		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class MaximizeAppWindowWithDragToTopDragZoneLandscape : MaximizeAppWindowWithDragToTopDragZone(
		rotation = ROTATION_90
		) {
		@ExpectedScenarios(["MAXIMIZE_APP"])
		@Test
		override fun maximizeAppWithDragToTopDragZone() = super.maximizeAppWithDragToTopDragZone()

		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)
		}
		}
		No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppWindowWithDragToTopDragZonePortrait.kt

deleted100644 → 0

+0 −50

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

		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP
		import com.android.wm.shell.scenarios.MaximizeAppWindowWithDragToTopDragZone
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Maximize app window by dragging it to the top drag zone.
		*
		* Assert that the app window keeps the same increases in size, filling the vertical and horizontal
		* stable display bounds.
		*/
		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class MaximizeAppWindowWithDragToTopDragZonePortrait : MaximizeAppWindowWithDragToTopDragZone() {
		@ExpectedScenarios(["MAXIMIZE_APP"])
		@Test
		override fun maximizeAppWithDragToTopDragZone() = super.maximizeAppWithDragToTopDragZone()

		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)
		}
		}
		No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/Android.bp

+0 −8

Original line number	Diff line number	Diff line
		@@ -134,7 +134,6 @@ test_module_config {
		"com.android.wm.shell.functional.maximize.ExitDesktopWithDragToTopDragZoneTest",
		"com.android.wm.shell.functional.maximize.MaximizeAppWindowTest",
		"com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",
		"com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneTest",
		"com.android.wm.shell.functional.resizing.ResizeAppCornerMultiWindowAndPipTest",
		"com.android.wm.shell.functional.resizing.ResizeAppCornerMultiWindowTest",
		"com.android.wm.shell.functional.resizing.ResizeAppWithCornerResizeTest",
		@@ -496,13 +495,6 @@ test_module_config {
		include_filters: ["com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"],
		}

		test_module_config {
		name: "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneTest",
		base: "FunctionalTestsDesktopMode",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneTest"],
		}

		test_module_config {
		name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest",
		base: "FunctionalTestsDesktopMode",

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/TEST_MAPPING

+0 −3

Original line number	Diff line number	Diff line
		@@ -165,9 +165,6 @@
		{
		"name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"
		},
		{
		"name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneTest"
		},
		{
		"name": "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest"
		},

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/maximize/MaximizeAppWindowWithDragToTopDragZoneTest.kt

deleted100644 → 0

+0 −29

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.functional.maximize

		import android.platform.test.annotations.Presubmit
		import android.platform.test.rule.ScreenRecordRule
		import com.android.wm.shell.scenarios.MaximizeAppWindowWithDragToTopDragZone
		import org.junit.runner.RunWith
		import org.junit.runners.BlockJUnit4ClassRunner

		/* Functional test for [MaximizeAppWindowWithDragToTopDragZone]. */
		@RunWith(BlockJUnit4ClassRunner::class)
		@Presubmit
		@ScreenRecordRule.ScreenRecord
		class MaximizeAppWindowWithDragToTopDragZoneTest : MaximizeAppWindowWithDragToTopDragZone()