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

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

Merge "Refactor the buildTransitions into overridable functions" into udc-dev... 

Merge "Refactor the buildTransitions into overridable functions" into udc-dev am: cf2e7655 am: 177667cd

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



Change-Id: I59b95cd0744d6eb41d4db728b824369b7125fa56
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b09db2d 177667cd

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

+17 −14
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder
@@ -55,19 +54,23 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class AutoEnterPipOnGoToHomeTest(flicker: FlickerTest) : EnterPipViaAppUiButtonTest(flicker) {

    /** Defines the transition used to run the test */

    override val transition: FlickerBuilder.() -> Unit

        get() = {

    override val thisTransition: FlickerBuilder.() -> Unit = {

        transitions { tapl.goHome() }

    }



    override val defaultEnterPip: FlickerBuilder.() -> Unit = {

        setup {

            pipApp.launchViaIntent(wmHelper)

            pipApp.enableAutoEnterForPipActivity()

        }

    }



    override val defaultTeardown: FlickerBuilder.() -> Unit = {

        teardown {

            // close gracefully so that onActivityUnpinned() can be called before force exit

            pipApp.closePipWindow(wmHelper)

            pipApp.exit(wmHelper)

        }

            transitions { tapl.goHome() }

    }



    @Presubmit

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

+31 −33
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ClosePipBySwipingDownTest(flicker: FlickerTest) : ClosePipTransition(flicker) {

    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)

    override val thisTransition: FlickerBuilder.() -> Unit = {

        transitions {

            val pipRegion = wmHelper.getWindowRegion(pipApp).bounds

            val pipCenterX = pipRegion.centerX()

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

+4 −5
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ import org.junit.runners.Parameterized 


/** Base class for exiting pip (closing pip window) without returning to the app */

abstract class ClosePipTransition(flicker: FlickerTest) : PipTransition(flicker) {

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

    override val thisTransition: FlickerBuilder.() -> Unit = {

        setup { this.setRotation(flicker.scenario.startRotation) }

        teardown { this.setRotation(Rotation.ROTATION_0) }

    }

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

+3 −6
Original line number Diff line number Diff line
@@ -54,10 +54,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ClosePipWithDismissButtonTest(flicker: FlickerTest) : ClosePipTransition(flicker) {



    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)

    override val thisTransition: FlickerBuilder.() -> Unit = {

        transitions { pipApp.closePipWindow(wmHelper) }

    }

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

+17 −13
Original line number Diff line number Diff line
@@ -45,19 +45,23 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTransition(flicker) {

    /** Defines the transition used to run the test */

    override val transition: FlickerBuilder.() -> Unit

        get() = {

    override val thisTransition: FlickerBuilder.() -> Unit = {

        transitions { tapl.goHome() }

    }



    override val defaultEnterPip: FlickerBuilder.() -> Unit = {

        setup {

            pipApp.launchViaIntent(wmHelper)

            pipApp.enableEnterPipOnUserLeaveHint()

        }

    }



    override val defaultTeardown: FlickerBuilder.() -> Unit = {

        teardown {

            // close gracefully so that onActivityUnpinned() can be called before force exit

            pipApp.closePipWindow(wmHelper)

            pipApp.exit(wmHelper)

        }

            transitions { tapl.goHome() }

    }



    @Presubmit