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

Commit a47460b9 authored by Ioana Moraru's avatar Ioana Moraru
Browse files

Revert "Use display information from layers trace on assertions" 

Revert "Use display information from layers trace on assertions"

Revert submission 15843711-flicker-displays-assertions

Reason for revert: Tests using navBarLayerRotatesAndScales and statusBarLayerRotatesScales became flaky
Reverted Changes:
I296381269:Use display information from layers trace on asser...
I9bec50ce1:Use display information from layers trace on asser...

Change-Id: I78e3306ef44a9054e1ef443d2161b088cb10bb97
parent 316587fa

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTransition.kt

+10 −2
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import android.app.Instrumentation 
import android.content.Context

import android.platform.test.annotations.Presubmit

import android.system.helpers.ActivityHelper

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.endRotation

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

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

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
@@ -177,9 +179,15 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) 


    @Presubmit

    @Test

    open fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

    open fun navBarLayerRotatesAndScales() {

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0,

            testSpec.config.endRotation)

    }



    @Presubmit

    @Test

    open fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    open fun statusBarLayerRotatesScales() {

        testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0,

            testSpec.config.endRotation)

    }

}
 
 No newline at end of file

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

+4 −2
Original line number Diff line number Diff line
@@ -107,11 +107,13 @@ class LegacySplitScreenToLauncher( 


    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

    fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.endRotation)



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)



    @Presubmit

    @Test

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

+5 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group2

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.endRotation

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

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

import com.android.server.wm.flicker.helpers.WindowUtils
@@ -132,10 +133,12 @@ class ResizeLegacySplitScreen( 
    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

    fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.endRotation)



    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)



    @Test

    fun topAppLayerIsAlwaysVisible() {

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

+7 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group2

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.endRotation

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

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales
@@ -74,11 +75,15 @@ class RotateOneLaunchedAppAndEnterSplitScreen( 


    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

    fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation,

            testSpec.config.endRotation)



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation,

            testSpec.config.endRotation)



    @Presubmit

    @Test

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

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group2

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.endRotation

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

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales
@@ -73,11 +74,13 @@ class RotateOneLaunchedAppInSplitScreenMode( 


    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(

        testSpec.config.startRotation, testSpec.config.endRotation)



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales(

        testSpec.config.startRotation, testSpec.config.endRotation)



    @Presubmit

    @Test