From c5d831fea17c815f2b888174ed2f6ada03d5a10d Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Wed, 31 Mar 2021 09:57:29 -0700
Subject: [PATCH] Flicker test for PiP and launcher shelf height

PipMovesInAllApps was intended to test the PiP window movement when the
shelf height of Launcher changes and breaks with the recent `Device
search` feature that opening all-apps in Launcher triggers both IME and
shelf height change.

Since PipKeyboardTest has covered PiP movement with IME, reimplement
this by launching a new app instead of going to all-apps and also rename
this test for its intention.

Bug: 184050344
Test: atest WMShellFlickerTests:PipShelfHeightTest
Change-Id: I102ea95e6e91c9707b73587282702b868eb705fb
---
 ...pMovesInAllApps.kt => PipShelfHeightTest.kt} | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
 rename libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/{PipMovesInAllApps.kt => PipShelfHeightTest.kt} (86%)

diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipMovesInAllApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipShelfHeightTest.kt
similarity index 86%
rename from libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipMovesInAllApps.kt
rename to libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipShelfHeightTest.kt
index 5713822bba999..84f66fc14969b 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipMovesInAllApps.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipShelfHeightTest.kt
@@ -18,13 +18,13 @@ package com.android.wm.shell.flicker.pip
 
 import android.platform.test.annotations.Presubmit
 import android.view.Surface
-import androidx.test.filters.FlakyTest
 import androidx.test.filters.RequiresDevice
 import com.android.launcher3.tapl.LauncherInstrumentation
 import com.android.server.wm.flicker.FlickerParametersRunnerFactory
 import com.android.server.wm.flicker.FlickerTestParameter
 import com.android.server.wm.flicker.FlickerTestParameterFactory
 import com.android.server.wm.flicker.dsl.FlickerBuilder
+import com.android.wm.shell.flicker.helpers.FixedAppHelper
 import com.google.common.truth.Truth
 import org.junit.FixMethodOrder
 import org.junit.Test
@@ -33,15 +33,16 @@ import org.junit.runners.MethodSorters
 import org.junit.runners.Parameterized
 
 /**
- * Test Pip launch.
- * To run this test: `atest WMShellFlickerTests:PipMovesInAllApps`
+ * Test Pip movement with Launcher shelf height change.
+ * To run this test: `atest WMShellFlickerTests:PipShelfHeightTest`
  */
 @RequiresDevice
 @RunWith(Parameterized::class)
 @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-class PipMovesInAllApps(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
+class PipShelfHeightTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
     private val taplInstrumentation = LauncherInstrumentation()
+    private val testApp = FixedAppHelper(instrumentation)
 
     override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
         get() = buildTransition(eachRun = false) {
@@ -49,10 +50,12 @@ class PipMovesInAllApps(testSpec: FlickerTestParameter) : PipTransition(testSpec
                 eachRun {
                     taplInstrumentation.pressHome()
                 }
+                test {
+                    testApp.exit(wmHelper)
+                }
             }
             transitions {
-                taplInstrumentation.pressHome().switchToAllApps()
-                wmHelper.waitForAppTransitionIdle()
+                testApp.launchViaIntent(wmHelper)
             }
         }
 
@@ -68,7 +71,7 @@ class PipMovesInAllApps(testSpec: FlickerTestParameter) : PipTransition(testSpec
         }
     }
 
-    @FlakyTest(bugId = 184050344)
+    @Presubmit
     @Test
     fun pipWindowMovesUp() = testSpec.assertWmEnd {
         val initialState = this.trace?.first()?.wmState