From 7974a23ffbe1375426b734d55f4b46da1b847d25 Mon Sep 17 00:00:00 2001
From: Nataniel Borges <natanieljr@google.com>
Date: Mon, 25 Jan 2021 18:31:30 +0100
Subject: [PATCH] Enable reopen IME from overview tests

The tests are stable in postsubmit, so they can be moved to presubmit

Bug: 175027130
Test: atest FlickerTests
Change-Id: Ic2e084d92ec2d1db6f87126493440b3be3efd6ba
---
 .../android/server/wm/flicker/ime/ReOpenImeWindowTest.kt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 e47e757404f73..79111199720d1 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.noUncoveredRegions
 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 @@ import org.junit.runners.Parameterized
  * 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 @@ class ReOpenImeWindowTest(
                             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()