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

Merge "Add missing isTablet assumptions to tests" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-07-17 11:51:33 +00:00
committed by Android (Google) Code Review
parent da79250098 cb0733bf83
commit e31c52fb35
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromAllApps.kt
View File

@@ -25,6 +25,7 @@ import androidx.test.uiautomator.UiDevice
import com.android.launcher3.tapl.LauncherInstrumentation
import com.android.wm.shell.flicker.service.Utils
import org.junit.After
import org.junit.Assume
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
@@ -45,6 +46,8 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) {
@Before
fun setup() {
Assume.assumeTrue(tapl.isTablet)
tapl.setEnableRotation(true)
tapl.setExpectedRotation(rotation.value)

3
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromNotification.kt
View File

@@ -25,6 +25,7 @@ import androidx.test.uiautomator.UiDevice
import com.android.launcher3.tapl.LauncherInstrumentation
import com.android.wm.shell.flicker.service.Utils
import org.junit.After
import org.junit.Assume
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
@@ -46,6 +47,8 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) {
@Before
fun setup() {
Assume.assumeTrue(tapl.isTablet)
tapl.setEnableRotation(true)
tapl.setExpectedRotation(rotation.value)

3
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromTaskbar.kt
View File

@@ -25,6 +25,7 @@ import androidx.test.uiautomator.UiDevice
import com.android.launcher3.tapl.LauncherInstrumentation
import com.android.wm.shell.flicker.service.Utils
import org.junit.After
import org.junit.Assume
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
@@ -45,6 +46,8 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) {
@Before
fun setup() {
Assume.assumeTrue(tapl.isTablet)
tapl.setEnableRotation(true)
tapl.setExpectedRotation(rotation.value)