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

Commit 4300b265 authored Jul 18, 2023 by Pablo Gamito Committed by Android (Google) Code Review Jul 18, 2023

Merge changes Ie6282dd8,Ibe625965 into main

* changes:
  Remove RequireDevice annotation from benchmark tests
  Add removed setup action

parents 49b91b60 18d1372c

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/benchmark/CopyContentInSplitGesturalNavLandscapeBenchmark.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
		import android.platform.test.annotations.PlatinumTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit
		import org.junit.Test

		@RequiresDevice
		class CopyContentInSplitGesturalNavLandscapeBenchmark : CopyContentInSplit(Rotation.ROTATION_90) {
		@PlatinumTest(focusArea = "sysui")
		@Presubmit

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/benchmark/CopyContentInSplitGesturalNavPortraitBenchmark.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
		import android.platform.test.annotations.PlatinumTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit
		import org.junit.Test

		@RequiresDevice
		class CopyContentInSplitGesturalNavPortraitBenchmark : CopyContentInSplit(Rotation.ROTATION_0) {
		@PlatinumTest(focusArea = "sysui")
		@Presubmit

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/benchmark/DismissSplitScreenByDividerGesturalNavLandscapeBenchmark.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
		import android.platform.test.annotations.PlatinumTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider
		import org.junit.Test

		@RequiresDevice
		class DismissSplitScreenByDividerGesturalNavLandscapeBenchmark :
		DismissSplitScreenByDivider(Rotation.ROTATION_90) {
		@PlatinumTest(focusArea = "sysui")

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/benchmark/DismissSplitScreenByDividerGesturalNavPortraitBenchmark.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
		import android.platform.test.annotations.PlatinumTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider
		import org.junit.Test

		@RequiresDevice
		class DismissSplitScreenByDividerGesturalNavPortraitBenchmark :
		DismissSplitScreenByDivider(Rotation.ROTATION_0) {
		@PlatinumTest(focusArea = "sysui")

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/benchmark/DismissSplitScreenByGoHomeGesturalNavLandscapeBenchmark.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
		import android.platform.test.annotations.PlatinumTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByGoHome
		import org.junit.Test

		@RequiresDevice
		class DismissSplitScreenByGoHomeGesturalNavLandscapeBenchmark :
		DismissSplitScreenByGoHome(Rotation.ROTATION_90) {
		@PlatinumTest(focusArea = "sysui")