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

Commit 683becc6 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add FlickerServiceRule to splitscreen platinum tests"" into main

parents 52948b07 d6562271

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/platinum/CopyContentInSplitGesturalNavLandscape.kt

+0 −5
Original line number Diff line number Diff line
@@ -19,15 +19,10 @@ package com.android.wm.shell.flicker.service.splitscreen.platinum 
import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import android.tools.device.flicker.rules.FlickerServiceRule

import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit

import org.junit.Rule

import org.junit.Test



open class CopyContentInSplitGesturalNavLandscape : CopyContentInSplit(Rotation.ROTATION_90) {

    @get:Rule

    val flickerServiceRule = FlickerServiceRule(enabled = true, failTestOnFlicker = false)



    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/platinum/CopyContentInSplitGesturalNavPortrait.kt

+0 −5
Original line number Diff line number Diff line
@@ -19,15 +19,10 @@ package com.android.wm.shell.flicker.service.splitscreen.platinum 
import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import android.tools.device.flicker.rules.FlickerServiceRule

import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit

import org.junit.Rule

import org.junit.Test



open class CopyContentInSplitGesturalNavPortrait : CopyContentInSplit(Rotation.ROTATION_0) {

    @get:Rule

    val flickerServiceRule = FlickerServiceRule(enabled = true, failTestOnFlicker = false)



    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/platinum/DismissSplitScreenByDividerGesturalNavLandscape.kt

+0 −5
Original line number Diff line number Diff line
@@ -19,16 +19,11 @@ package com.android.wm.shell.flicker.service.splitscreen.platinum 
import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import android.tools.device.flicker.rules.FlickerServiceRule

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider

import org.junit.Rule

import org.junit.Test



open class DismissSplitScreenByDividerGesturalNavLandscape :

    DismissSplitScreenByDivider(Rotation.ROTATION_90) {

    @get:Rule

    val flickerServiceRule = FlickerServiceRule(enabled = true, failTestOnFlicker = false)



    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/platinum/DismissSplitScreenByDividerGesturalNavPortrait.kt

+0 −5
Original line number Diff line number Diff line
@@ -19,16 +19,11 @@ package com.android.wm.shell.flicker.service.splitscreen.platinum 
import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import android.tools.device.flicker.rules.FlickerServiceRule

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider

import org.junit.Rule

import org.junit.Test



open class DismissSplitScreenByDividerGesturalNavPortrait :

    DismissSplitScreenByDivider(Rotation.ROTATION_0) {

    @get:Rule

    val flickerServiceRule = FlickerServiceRule(enabled = true, failTestOnFlicker = false)



    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/platinum/DismissSplitScreenByGoHomeGesturalNavLandscape.kt

+0 −5
Original line number Diff line number Diff line
@@ -19,16 +19,11 @@ package com.android.wm.shell.flicker.service.splitscreen.platinum 
import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import android.tools.device.flicker.rules.FlickerServiceRule

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByGoHome

import org.junit.Rule

import org.junit.Test



open class DismissSplitScreenByGoHomeGesturalNavLandscape :

    DismissSplitScreenByGoHome(Rotation.ROTATION_90) {

    @get:Rule

    val flickerServiceRule = FlickerServiceRule(enabled = true, failTestOnFlicker = false)



    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test