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

Commit ef6f9a0d authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Promote PIP postsubmit tests to presubmit" into sc-dev am: 1f9f16f8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13852565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7316adbdf6e481ee9ffa8f4d7c708e715d55d80f
parents f1d3b37b 1f9f16f8

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithSwipeTest.kt

+10 −10
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -51,40 +51,40 @@ class PipCloseWithSwipeTest(testSpec: FlickerTestParameter) : PipCloseTransition 
            }

        }



    @Postsubmit

    @Presubmit

    @Test

    override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @Postsubmit

    @Presubmit

    @Test

    override fun noUncoveredRegions() = super.noUncoveredRegions()



    @Postsubmit

    @Presubmit

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt

+9 −9
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -78,7 +78,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
            }

        }



    @Postsubmit

    @Presubmit

    @Test

    fun pipWindowInsideDisplayBounds() {

        testSpec.assertWm {
@@ -86,7 +86,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun bothAppWindowsVisible() {

        testSpec.assertWmEnd {
@@ -96,15 +96,15 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun pipLayerInsideDisplayBounds() {

        testSpec.assertLayers {
@@ -112,7 +112,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun bothAppLayersVisible() {

        testSpec.assertLayersEnd {
@@ -121,11 +121,11 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible()