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

Run tablet specific assertions only on tablets

Browse Source 
To avoid assumption failures

Fixes: 262390300

Test: atest FlickerTests:SeamlessAppRotationTest
Change-Id: Ie02ef527640f1e0637297deefe7a743a5e126d5c
This commit is contained in:
Pablo Gamito
2022-12-13 16:56:03 +00:00
parent bfb05c5e31
commit 4faf378213
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt
View File

@@ -106,7 +106,9 @@ class CloseImeWindowToAppTest(flicker: FlickerTest) : BaseTest(flicker) {
@IwTest(focusArea = "ime")
override fun cujCompleted() {
super.cujCompleted()
navBarLayerPositionAtStartAndEnd()
if (!flicker.scenario.isTablet) {
navBarLayerPositionAtStartAndEnd()
}
imeLayerBecomesInvisible()
imeAppLayerIsAlwaysVisible()
imeAppWindowIsAlwaysVisible()

4
tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt
View File

@@ -104,7 +104,9 @@ class CloseImeWindowToHomeTest(flicker: FlickerTest) : BaseTest(flicker) {
@IwTest(focusArea = "ime")
override fun cujCompleted() {
super.cujCompleted()
navBarLayerPositionAtStartAndEnd()
if (!flicker.scenario.isTablet) {
navBarLayerPositionAtStartAndEnd()
}
imeLayerBecomesInvisible()
imeAppWindowBecomesInvisible()
imeWindowBecomesInvisible()

12
tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
View File

@@ -213,6 +213,14 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl
// not yet tablet compatible
appLayerRotates()
appLayerAlwaysVisible()
// not tablet compatible
navBarLayerIsVisibleAtStartAndEnd()
navBarWindowIsAlwaysVisible()
}
if (flicker.scenario.isTablet) {
taskBarLayerIsVisibleAtStartAndEnd()
taskBarWindowIsAlwaysVisible()
}
appWindowFullScreen()
@@ -223,10 +231,6 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl
appLayerRotates_StartingPos()
appLayerRotates_EndingPos()
entireScreenCovered()
navBarLayerIsVisibleAtStartAndEnd()
navBarWindowIsAlwaysVisible()
taskBarLayerIsVisibleAtStartAndEnd()
taskBarWindowIsAlwaysVisible()
visibleLayersShownMoreThanOneConsecutiveEntry()
visibleWindowsShownMoreThanOneConsecutiveEntry()
}