commit 75cb39f47fdd89b2d417f5f7c7ad4d345f533e10
author Graciela Wissen Putri <gracielawputri@google.com> Wed Feb 01 15:33:57 2023 +0000
committer Graciela Wissen Putri <gracielawputri@google.com> Mon Feb 06 13:26:08 2023 +0000
tree 8b82889ea0366a509f5023adc9d3323a8214a937
parent 473b8262a968b53cef274dece6e2ead2e213ded2

Use launch intent and disable TAPL

Recents not found with TAPL in full screen 3 Button Nav mode

Bug: 246281703
Test: atest FlickerTests:OpenAppAfterCameraTest
Change-Id: I318f1a34403f53a7fde1ef99302e75d522e08db3

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/CameraAppHelper.kt

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/CameraAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/CameraAppHelper.kt
index a2d4d3a..0b6867c 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/CameraAppHelper.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/CameraAppHelper.kt
@@ -27,35 +27,31 @@
 @JvmOverloads
 constructor(
     instrumentation: Instrumentation,
-    pkgManager: PackageManager = instrumentation.context.packageManager
+    private val pkgManager: PackageManager = instrumentation.context.packageManager
 ) :
     StandardAppHelper(
         instrumentation,
         getCameraLauncherName(pkgManager),
         getCameraComponent(pkgManager)
     ) {
+    override fun getOpenAppIntent(): Intent =
+        pkgManager.getLaunchIntentForPackage(packageName)
+            ?: error("Unable to find intent for camera")
+
     companion object {
-        private fun getCameraIntent(): Intent {
-            return Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-        }
+        private fun getCameraIntent(): Intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
 
-        private fun getResolveInfo(pkgManager: PackageManager): ResolveInfo {
-            val intent = getCameraIntent()
-            return pkgManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
+        private fun getResolveInfo(pkgManager: PackageManager): ResolveInfo =
+            pkgManager.resolveActivity(getCameraIntent(), PackageManager.MATCH_DEFAULT_ONLY)
                 ?: error("unable to resolve camera activity")
-        }
 
-        private fun getCameraComponent(pkgManager: PackageManager): ComponentNameMatcher {
-            val resolveInfo = getResolveInfo(pkgManager)
-            return ComponentNameMatcher(
-                resolveInfo.activityInfo.packageName,
-                className = resolveInfo.activityInfo.name
+        private fun getCameraComponent(pkgManager: PackageManager): ComponentNameMatcher =
+            ComponentNameMatcher(
+                getResolveInfo(pkgManager).activityInfo.packageName,
+                className = ""
             )
-        }
 
-        private fun getCameraLauncherName(pkgManager: PackageManager): String {
-            val resolveInfo = getResolveInfo(pkgManager)
-            return resolveInfo.activityInfo.name
-        }
+        private fun getCameraLauncherName(pkgManager: PackageManager): String =
+            getResolveInfo(pkgManager).loadLabel(pkgManager).toString()
     }
 }

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt
index baa2750..0942287 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt
@@ -49,8 +49,9 @@
                 // 1. Open camera - cold -> close it first
                 cameraApp.exit(wmHelper)
                 cameraApp.launchViaIntent(wmHelper)
-                // 2. Press home button (button nav mode) / swipe up to home (gesture nav mode)
-                tapl.goHome()
+                // Can't use TAPL due to Recents not showing in 3 Button Nav in full screen mode
+                device.pressHome()
+                tapl.getWorkspace()
             }
             teardown { testApp.exit(wmHelper) }
             transitions { testApp.launchViaIntent(wmHelper) }