diff options
| author | 2020-10-26 11:02:31 +0000 | |
|---|---|---|
| committer | 2020-10-26 11:02:31 +0000 | |
| commit | 1881c8cd9924c9e963abd7250e930277f22956f1 (patch) | |
| tree | 8475983bf11b7a4b3778c873534585cebd1124e8 | |
| parent | 9a095a4e40f4dac1e324fe31b91d65b1095ab05f (diff) | |
| parent | 5c1f0b693ea7e44a022fa19122002b6b2b3d606f (diff) | |
Merge "Disabling status bar & navbar assertions in tests"
4 files changed, 8 insertions, 16 deletions
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index 992493143179..6cc2e2236127 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -100,10 +100,8 @@ class CloseImeAutoOpenWindowToHomeTest( Surface.ROTATION_0, bugId = 140855415) statusBarLayerRotatesScales(configuration.startRotation, Surface.ROTATION_0) - navBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) - statusBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) imeLayerBecomesInvisible(bugId = 141458352) imeAppLayerBecomesInvisible(testApp, bugId = 153739621) } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index 46f584b51e8c..8d9881ec2063 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -106,10 +106,8 @@ class CloseImeWindowToHomeTest( Surface.ROTATION_0, bugId = 140855415) statusBarLayerRotatesScales(configuration.startRotation, Surface.ROTATION_0) - navBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) - statusBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) imeLayerBecomesInvisible(bugId = 153739621) imeAppLayerBecomesInvisible(testApp, bugId = 153739621) } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 1194933ee315..ad23d9f48568 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -100,10 +100,8 @@ class OpenAppColdTest( configuration.endRotation) statusBarLayerRotatesScales(Surface.ROTATION_0, configuration.endRotation) - navBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) - statusBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible(testApp) } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 136be29e421d..5886a61eed34 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -104,10 +104,8 @@ class OpenAppWarmTest( configuration.endRotation) statusBarLayerRotatesScales(Surface.ROTATION_0, configuration.endRotation) - navBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) - statusBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible(testApp) } |