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

Commit e852b071 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Fix use of NavigationModeRule on flicker

The method was ignored before and now should be activated to enable 3 button mode. Some tests become flaky in 3-button mode and should be disabled for the moment.

Test: atest FlickerTests WMShellFlickerTests
Bug: 162925924
Change-Id: Ife24ad85c302da6fc193f1a5a226722cfed51b2b
parent 7f9caf4c
Loading
Loading
Loading
Loading
+8 −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,10 @@ abstract class RotateTwoLaunchedAppsTransition(
                }
            }
        }

    @FlakyTest
    @Test
    override fun navBarLayerRotatesAndScales() {
        super.navBarLayerRotatesAndScales()
    }
}
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class LegacySplitScreenToLauncher(
    fun statusBarLayerRotatesScales() =
        testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)

    @Presubmit
    @FlakyTest
    @Test
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
        super.visibleLayersShownMoreThanOneConsecutiveEntry()
+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestParame
                    .getConfigNonRotationTests(
                            repetitions = 3,
                            supportedNavigationModes = listOf(
                                    WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY,
                                    WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,
                                    WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
                            )
                    )
+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,18 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
        super.visibleLayersShownMoreThanOneConsecutiveEntry()
    }

    @FlakyTest
    @Test
    override fun navBarLayerRotatesAndScales() {
        super.navBarLayerRotatesAndScales()
    }

    @FlakyTest
    @Test
    override fun focusChanges() {
        super.focusChanges()
    }

    companion object {
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
        super.focusChanges()
    }

    @FlakyTest
    @Test
    override fun navBarLayerRotatesAndScales() {
        super.navBarLayerRotatesAndScales()
    }

    @FlakyTest
    @Test
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {