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

Commit b62fb90d authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge "Remove status bar visibility check in lock screen" into sc-v2-dev

parents aa67cba3 9d7afb80
Loading
Loading
Loading
Loading
+32 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.annotation.Group1
import com.android.server.wm.flicker.helpers.NonResizeableAppHelper
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.statusBarWindowIsVisible
import com.android.server.wm.flicker.helpers.WindowUtils
import com.android.server.wm.traces.common.FlickerComponentName
import com.google.common.truth.Truth
import org.junit.FixMethodOrder
@@ -171,6 +171,37 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti
    @Test
    override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()

    /**
     * Checks that the status bar layer is visible at the end of the trace
     *
     * It is not possible to check at the start because the animation is working differently
     * in devices with and without blur (b/202936526)
     */
    @Presubmit
    @Test
    override fun statusBarLayerIsVisible() {
        testSpec.assertLayersEnd {
            this.isVisible(FlickerComponentName.STATUS_BAR)
        }
    }

    /** {@inheritDoc} */
    @FlakyTest(bugId = 202936526)
    @Test
    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    /** {@inheritDoc} */
    @Presubmit
    @Test
    fun statusBarLayerPositionAtEnd() {
        testSpec.assertLayersEnd {
            val display = this.entry.displays.minByOrNull { it.id }
                ?: throw RuntimeException("There is no display!")
            this.visibleRegion(FlickerComponentName.STATUS_BAR)
                .coversExactly(WindowUtils.getStatusBarPosition(display))
        }
    }

    /** {@inheritDoc} */
    @FlakyTest
    @Test