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

Commit fedbf2a4 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Use display information from layers trace on assertions"

parents a7795f35 5f36f4b8

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class LegacySplitScreenToLauncher( 


    @Presubmit

    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered(testSpec.config.endRotation)

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.server.wm.flicker.annotation.Group2 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.entireScreenCovered

import com.android.server.wm.flicker.helpers.launchSplitScreen

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsVisible

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import com.android.wm.shell.flicker.appPairsDividerBecomesVisible
@@ -77,7 +76,7 @@ class OpenAppToLegacySplitScreen( 


    @Presubmit

    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered(testSpec.config.startRotation)

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class ResizeLegacySplitScreen( 
    fun statusBarLayerIsVisible() = testSpec.statusBarLayerIsVisible()



    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered(testSpec.config.endRotation)

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Test

    fun navBarLayerRotatesAndScales() =

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

+3 −2
Original line number Diff line number Diff line
@@ -126,11 +126,12 @@ class EnterPipToOtherOrientationTest( 


    /**

     * Checks that all parts of the screen are covered at the start and end of the transition

     *

     * TODO b/197726599 Prevents all states from being checked

     */

    @Presubmit

    @Test

    override fun entireScreenCovered() =

        testSpec.entireScreenCovered(Surface.ROTATION_90, Surface.ROTATION_0, allStates = false)

    override fun entireScreenCovered() = testSpec.entireScreenCovered(allStates = false)



    /**

     * Checks [pipApp] window remains visible and on top throughout the transition

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

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) 
     */

    @Presubmit

    @Test

    override fun entireScreenCovered() = testSpec.entireScreenCovered(testSpec.config.startRotation,

        testSpec.config.endRotation, allStates = false)

    override fun entireScreenCovered() = testSpec.entireScreenCovered()



    /**

     * Checks the position of the navigation bar at the start and end of the transition