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

Commit 5e3c95bf authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "New CUJ: Swipe pip window to bottom center to close" into sc-dev

parents f91017a5 ca353102

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipToHomeTest.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseTransition.kt

+12 −28
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@ 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.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
@@ -34,21 +32,10 @@ import com.android.server.wm.flicker.startRotation 
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/**

 * Test Pip launch.

 * To run this test: `atest WMShellFlickerTests:PipToHomeTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class PipToHomeTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

abstract class PipCloseTransition(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = buildTransition(eachRun = true) { configuration ->

            setup {
@@ -61,30 +48,27 @@ class PipToHomeTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
                    this.setRotation(Surface.ROTATION_0)

                }

            }

            transitions {

                pipApp.closePipWindow(wmHelper)

            }

        }



    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()

    open fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()

    open fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()

    open fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()

    open fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun pipWindowBecomesInvisible() {

    open fun pipWindowBecomesInvisible() {

        testSpec.assertWm {

            this.showsAppWindow(PIP_WINDOW_TITLE)

                .then()
@@ -94,7 +78,7 @@ class PipToHomeTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 


    @Presubmit

    @Test

    fun pipLayerBecomesInvisible() {

    open fun pipLayerBecomesInvisible() {

        testSpec.assertLayers {

            this.isVisible(PIP_WINDOW_TITLE)

                .then()
@@ -104,22 +88,22 @@ class PipToHomeTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 


    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() =

    open fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @Presubmit

    @Test

    fun noUncoveredRegions() =

    open fun noUncoveredRegions() =

        testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0)



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() =

    open fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @FlakyTest(bugId = 151179149)

    @Test

    fun focusChanges() = testSpec.focusChanges(pipApp.launcherName, "NexusLauncherActivity")

    open fun focusChanges() = testSpec.focusChanges(pipApp.launcherName, "NexusLauncherActivity")



    companion object {

        @Parameterized.Parameters(name = "{0}")

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

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.dsl.FlickerBuilder

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/**

 * Test Pip launch.

 * To run this test: `atest WMShellFlickerTests:PipCloseWithDismissButton`

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class PipCloseWithDismissButtonTest(testSpec: FlickerTestParameter) : PipCloseTransition(testSpec) {

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = {

            super.transition(this, it)

            transitions {

                pipApp.closePipWindow(wmHelper)

            }

        }

}
 
 No newline at end of file

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

0 → 100644
+90 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import android.platform.test.annotations.Postsubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/**

 * Test Pip launch.

 * To run this test: `atest WMShellFlickerTests:PipCloseWithSwipe`

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class PipCloseWithSwipeTest(testSpec: FlickerTestParameter) : PipCloseTransition(testSpec) {

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = {

            super.transition(this, it)

            transitions {

                val pipRegion = wmHelper.getWindowRegion(pipApp.component).bounds

                val pipCenterX = pipRegion.centerX()

                val pipCenterY = pipRegion.centerY()

                val displayCenterX = device.displayWidth / 2

                device.swipe(pipCenterX, pipCenterY, displayCenterX, device.displayHeight, 5)

            }

        }



    @Postsubmit

    @Test

    override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible()



    @Postsubmit

    @Test

    override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible()



    @Postsubmit

    @Test

    override fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @Postsubmit

    @Test

    override fun noUncoveredRegions() = super.noUncoveredRegions()



    @Postsubmit

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

}
 
 No newline at end of file