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

Commit 2da36847 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Simplify the test step after changing navigation mode" into main

parents 73a9932a a6305420

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(