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

Commit a6305420 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Simplify the test step after changing navigation mode 

Since the related changes of [1], the display configuration change
can take effect with navigation mode change (resource overlay change).
It no longer needs to start an additional activity to refresh the
display configuration.

[1]: Id7b7f4f7a647edd51b4d3255131eb2052f403784

Bug: 275566237
Test: FlickerTests
Change-Id: Ib87ac970c5546cb2d999247a216a1b62d89092f8
parent 7a25f1bc

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt

+0 −5
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ import android.platform.test.rule.PressHomeRule 
import android.platform.test.rule.UnlockScreenRule

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.device.apphelpers.MessagingAppHelper

import android.tools.device.flicker.rules.ChangeDisplayOrientationRule

import android.tools.device.flicker.rules.LaunchAppRule

import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule

import androidx.test.platform.app.InstrumentationRegistry

import org.junit.rules.RuleChain
@@ -37,9 +35,6 @@ object Utils { 
            .around(

                NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)

            )

            .around(

                LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)

            )

            .around(RemoveAllTasksButHomeRule())

            .around(

                ChangeDisplayOrientationRule(

tests/FlickerTests/src/com/android/server/wm/flicker/service/Utils.kt

+0 −5
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ import android.platform.test.rule.PressHomeRule 
import android.platform.test.rule.UnlockScreenRule

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.device.apphelpers.MessagingAppHelper

import android.tools.device.flicker.rules.ChangeDisplayOrientationRule

import android.tools.device.flicker.rules.LaunchAppRule

import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule

import androidx.test.platform.app.InstrumentationRegistry

import org.junit.rules.RuleChain
@@ -37,9 +35,6 @@ object Utils { 
            .around(

                NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)

            )

            .around(

                LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)

            )

            .around(RemoveAllTasksButHomeRule())

            .around(

                ChangeDisplayOrientationRule(