Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75cb39f4 authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

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
parent 473b8262

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

+14 −18
Original line number Diff line number Diff line
@@ -27,35 +27,31 @@ class CameraAppHelper 
@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

+3 −2
Original line number Diff line number Diff line
@@ -49,8 +49,9 @@ open class OpenAppAfterCameraTest(flicker: FlickerTest) : OpenAppFromLauncherTra 
                // 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) }