Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riddle Hsu
2023-07-26 15:06:30 +00:00
committed by Android (Google) Code Review
parent 3a01fab3a2 234cbdd4ee
commit 9bb258d85f
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,9 @@ 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
@@ -35,6 +37,9 @@ object Utils {
.around(
NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)
)
.around(
LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)
)
.around(RemoveAllTasksButHomeRule())
.around(
ChangeDisplayOrientationRule(

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

@@ -22,7 +22,9 @@ 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
@@ -35,6 +37,9 @@ object Utils {
.around(
NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)
)
.around(
LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)
)
.around(RemoveAllTasksButHomeRule())
.around(
ChangeDisplayOrientationRule(