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

Commit e31c52fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add missing isTablet assumptions to tests" into main

parents da792500 cb0733bf

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

+3 −0
Original line number Diff line number Diff line
@@ -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)

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

+3 −0
Original line number Diff line number Diff line
@@ -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)

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

+3 −0
Original line number Diff line number Diff line
@@ -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)