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

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

Merge changes from topics "3button-runner", "re-enable-flicker" into sc-dev 

* changes:
  Disable some trace assertions
  Fix use of NavigationModeRule on flicker
parents f379c17e c258d7f4

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

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ class AppPairsTestCannotPairNonResizeableApps( 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    fun appPairsDividerIsInvisible() = testSpec.appPairsDividerIsInvisible()

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

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        }

    }



    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
            }

        }



    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    fun bothAppWindowsVisible() {

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

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( 
    @Test

    override fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    fun bothAppWindowsVisible() {

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

+14 −0
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
package com.android.wm.shell.flicker.apppairs



import android.view.Surface

import androidx.test.filters.FlakyTest

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

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

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

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

import com.android.wm.shell.flicker.helpers.SplitScreenHelper

import org.junit.Test



abstract class RotateTwoLaunchedAppsTransition(

    testSpec: FlickerTestParameter
@@ -49,4 +51,16 @@ abstract class RotateTwoLaunchedAppsTransition( 
                }

            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() {

        super.navBarLayerRotatesAndScales()

    }

}
 
 No newline at end of file