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

Commit 16d3c166 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Use tapl instrumentation to go home." into tm-qpr-dev am: 9a817344 am: 685c2304 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819492



Change-Id: I6e77c1d46e72d5f0cf1f971a2c4b25fc80466d9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2298b058 685c2304

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/PipAppHelper.kt

+0 −27
Original line number Diff line number Diff line
@@ -107,33 +107,6 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper( 
        uiDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "dismiss")), FIND_TIMEOUT)

    }



    @JvmOverloads

    fun enterPipViaHomeButton(wmHelper: WindowManagerStateHelper) {

        uiDevice.pressHome()



        // Wait on WMHelper or simply wait for 3 seconds

        wmHelper.waitPipShown() ?: SystemClock.sleep(3_000)

        // when entering pip, the dismiss button is visible at the start. to ensure the pip

        // animation is complete, wait until the pip dismiss button is no longer visible.

        // b/176822698: dismiss-only state will be removed in the future

        uiDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "dismiss")), FIND_TIMEOUT)

    }



    @JvmOverloads

    fun enterPipViaSwipeToHome(wmHelper: WindowManagerStateHelper) {

        uiDevice.swipe(

            uiDevice.displayWidth / 2, uiDevice.displayHeight - 10,

            uiDevice.displayWidth / 2, uiDevice.displayHeight - 300, 3

        )



        // Wait on WMHelper or simply wait for 3 seconds

        wmHelper.waitPipShown() ?: SystemClock.sleep(3_000)

        // when entering pip, the dismiss button is visible at the start. to ensure the pip

        // animation is complete, wait until the pip dismiss button is no longer visible.

        // b/176822698: dismiss-only state will be removed in the future

        uiDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "dismiss")), FIND_TIMEOUT)

    }



    fun enableEnterPipOnUserLeaveHint() {

        clickObject(ENTER_PIP_ON_USER_LEAVE_HINT)

    }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt

+3 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip 


import android.platform.test.annotations.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.annotation.Group3
@@ -52,7 +53,7 @@ import org.junit.runners.Parameterized 
@Group3

@FlakyTest(bugId = 234848637)

class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest(testSpec) {



    protected val taplInstrumentation = LauncherInstrumentation()

    /**

     * Defines the transition used to run the test

     */
@@ -71,10 +72,7 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
                }

            }

            transitions {

                when (testSpec.isGesturalNavigation) {

                    true -> pipApp.enterPipViaSwipeToHome(wmHelper)

                    false -> pipApp.enterPipViaHomeButton(wmHelper)

                }

                taplInstrumentation.goHome()

            }

        }