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

Merge "Remove duplicate isTablet initialization"

Browse Source
This commit is contained in:
Nataniel Borges
2022-12-20 17:51:23 +00:00
committed by Android (Google) Code Review
parent 3562f1f82a 5eead5ee5f
commit 1c7719f144
5 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt
View File

@@ -33,7 +33,6 @@ import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
import com.android.server.wm.flicker.taskBarLayerIsVisibleAtStartAndEnd
import com.android.server.wm.flicker.taskBarWindowIsAlwaysVisible
import com.android.server.wm.traces.common.ComponentNameMatcher
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
import org.junit.Assume
import org.junit.Test
@@ -49,15 +48,6 @@ constructor(
protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),
protected val tapl: LauncherInstrumentation = LauncherInstrumentation()
) {
init {
flicker.scenario.setIsTablet(
WindowManagerStateHelper(instrumentation, clearCacheAfterParsing = false)
.currentState
.wmState
.isTablet
)
}
/** Specification of the test transition to execute */
abstract val transition: FlickerBuilder.() -> Unit
@@ -68,7 +58,7 @@ constructor(
@FlickerBuilderProvider
fun buildFlicker(): FlickerBuilder {
return FlickerBuilder(instrumentation).apply {
setup { flicker.scenario.setIsTablet(wmHelper.currentState.wmState.isTablet) }
setup { flicker.scenario.setIsTablet(tapl.isTablet) }
transition()
}
}

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt
View File

@@ -120,7 +120,7 @@ class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flick
*/
@Before
fun setup() {
Assume.assumeFalse(flicker.scenario.isTablet)
Assume.assumeFalse(tapl.isTablet)
}
/**

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt
View File

@@ -103,7 +103,7 @@ open class SetRequestedOrientationWhilePinnedTest(flicker: FlickerTest) : PipTra
*/
@Before
fun setup() {
Assume.assumeFalse(flicker.scenario.isTablet)
Assume.assumeFalse(tapl.isTablet)
}
@Presubmit

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromShortcut.kt
View File

@@ -53,7 +53,7 @@ class EnterSplitScreenByDragFromShortcut(flicker: FlickerTest) : SplitScreenBase
@Before
fun before() {
Assume.assumeTrue(flicker.scenario.isTablet)
Assume.assumeTrue(tapl.isTablet)
}
override val transition: FlickerBuilder.() -> Unit

7
tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt
View File

@@ -23,7 +23,6 @@ import androidx.test.platform.app.InstrumentationRegistry
import com.android.launcher3.tapl.LauncherInstrumentation
import com.android.server.wm.flicker.junit.FlickerBuilderProvider
import com.android.server.wm.traces.common.ComponentNameMatcher
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
import org.junit.Assume
import org.junit.AssumptionViolatedException
import org.junit.Test
@@ -41,12 +40,6 @@ constructor(
protected val tapl: LauncherInstrumentation = LauncherInstrumentation()
) {
init {
flicker.scenario.setIsTablet(
WindowManagerStateHelper(instrumentation, clearCacheAfterParsing = false)
.currentState
.wmState
.isTablet
)
tapl.setExpectedRotationCheckEnabled(true)
}