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

Commit 455930fc authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Promote passing OpenAppNonResizeableTest tests" into udc-dev am:...

Merge "Merge "Promote passing OpenAppNonResizeableTest tests" into udc-dev am: d2d746ce am: 5c4b3d94"
parents b996f63d 15126357
Loading
Loading
Loading
Loading
+14 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.server.wm.flicker.launch

import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.tools.common.NavBar
import android.tools.common.Rotation
@@ -70,7 +69,7 @@ open class OpenAppNonResizeableTest(flicker: FlickerTest) : OpenAppFromLockTrans
     * Checks that the [ComponentNameMatcher.NAV_BAR] layer starts invisible, becomes visible during
     * unlocking animation and remains visible at the end
     */
    @FlakyTest(bugId = 227083463)
    @Presubmit
    @Test
    fun navBarLayerVisibilityChanges() {
        Assume.assumeFalse(flicker.scenario.isTablet)
@@ -155,8 +154,19 @@ open class OpenAppNonResizeableTest(flicker: FlickerTest) : OpenAppFromLockTrans
    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
    override fun statusBarWindowIsAlwaysVisible() {}

    /** {@inheritDoc} */
    @Presubmit
    @Test
    override fun appWindowBecomesFirstAndOnlyTopWindow() =
        super.appWindowBecomesFirstAndOnlyTopWindow()

    /** {@inheritDoc} */
    @Presubmit
    @Test
    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()

    /** Checks the [ComponentNameMatcher.NAV_BAR] is visible at the end of the transition */
    @Postsubmit
    @Presubmit
    @Test
    fun navBarLayerIsVisibleAtEnd() {
        Assume.assumeFalse(flicker.scenario.isTablet)
@@ -185,18 +195,11 @@ open class OpenAppNonResizeableTest(flicker: FlickerTest) : OpenAppFromLockTrans
        super.appLayerBecomesVisible()
    }

    /** {@inheritDoc} */
    @FlakyTest @Test override fun entireScreenCovered() = super.entireScreenCovered()

    @FlakyTest(bugId = 218470989)
    @Presubmit
    @Test
    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

    @FlakyTest(bugId = 227143265)
    @Test
    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()

    @FlakyTest(bugId = 251217585)
    @Test
    override fun focusChanges() {