commit f69a29928db668594a2b2f91e86d84dc06a6472f
author Nataniel Borges <natanieljr@google.com> Mon Jan 25 19:53:21 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 19:53:21 2021 +0000
tree b701c13dffb4ac2064d60c6e3439a19704a18d58
parent 13d417bfe72b534fe32bf15ad46054270c050e81
parent 7974a23ffbe1375426b734d55f4b46da1b847d25

Merge "Enable reopen IME from overview tests"

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
index e47e757..7911119 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
@@ -16,6 +16,7 @@
 
 package com.android.server.wm.flicker.ime
 
+import android.platform.test.annotations.Presubmit
 import android.view.Surface
 import androidx.test.filters.RequiresDevice
 import androidx.test.platform.app.InstrumentationRegistry
@@ -38,6 +39,7 @@
 import com.android.server.wm.flicker.repetitions
 import com.android.server.wm.flicker.startRotation
 import com.android.server.wm.flicker.endRotation
+import com.android.server.wm.flicker.helpers.isRotated
 import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible
 import com.android.server.wm.flicker.statusBarLayerRotatesScales
 import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
@@ -51,6 +53,7 @@
  * Test IME window opening transitions.
  * To run this test: `atest FlickerTests:ReOpenImeWindowTest`
  */
+@Presubmit
 @RequiresDevice
 @RunWith(Parameterized::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -109,9 +112,11 @@
                             layersTrace {
                                 noUncoveredRegions(Surface.ROTATION_0, configuration.endRotation)
                                 navBarLayerRotatesAndScales(Surface.ROTATION_0,
-                                        configuration.endRotation)
+                                        configuration.endRotation,
+                                        enabled = !configuration.startRotation.isRotated())
                                 statusBarLayerRotatesScales(Surface.ROTATION_0,
-                                        configuration.endRotation)
+                                        configuration.endRotation,
+                                        enabled = !configuration.startRotation.isRotated())
                                 statusBarLayerIsAlwaysVisible()
                                 navBarLayerIsAlwaysVisible()
                                 visibleLayersShownMoreThanOneConsecutiveEntry()