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

Commit 177ea8c1 authored by Vania Desmonda's avatar Vania Desmonda
Browse files

Add 2 more CUJs for maximizing app via double tap and menu button. 

Test: atest MaximizeAppViaHeaderMenuLandscape, etc.
Fixes: 399638902
Flag: EXEMPT adding flicker tests
Change-Id: I3abb7404be31bb605739360f51b639b1c71bd80e
parent 16e7d300

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppDoubleTapAppHeaderLandscape.kt

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

 * Copyright (C) 2025 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



import android.tools.Rotation.ROTATION_90

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper.MaximizeDesktopAppTrigger

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP

import com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test

import org.junit.runner.RunWith



/**

 * Maximize app window by double tapping on the app header.

 *

 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppDoubleTapAppHeaderLandscape : MaximizeAppWindow(

    rotation = ROTATION_90,

    trigger = MaximizeDesktopAppTrigger.DOUBLE_TAP_APP_HEADER

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppDoubleTapAppHeaderPortrait.kt

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

 * Copyright (C) 2024 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



import android.tools.Rotation.ROTATION_0

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper.MaximizeDesktopAppTrigger

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP

import com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test

import org.junit.runner.RunWith



/**

 * Maximize app window by double tapping on the app header in portrait mode.

 *

 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppDoubleTapAppHeaderPortrait : MaximizeAppWindow(

    rotation = ROTATION_0,

    trigger = MaximizeDesktopAppTrigger.DOUBLE_TAP_APP_HEADER

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppViaHeaderMenuLandscape.kt

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

 * Copyright (C) 2024 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



import android.tools.Rotation.ROTATION_90

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper.MaximizeDesktopAppTrigger

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP

import com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test

import org.junit.runner.RunWith



/**

 * Maximize app window by tapping on the maximize button within the app header maximize menu.

 *

 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppViaHeaderMenuLandscape : MaximizeAppWindow(

    rotation = ROTATION_90,

    trigger = MaximizeDesktopAppTrigger.MAXIMIZE_BUTTON_IN_MENU

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppViaHeaderMenuPortrait.kt

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

 * Copyright (C) 2024 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



import android.tools.Rotation.ROTATION_0

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper.MaximizeDesktopAppTrigger

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP

import com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test

import org.junit.runner.RunWith



/**

 * Maximize app window by tapping on the maximize button within the app header maximize menu.

 *

 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppViaHeaderMenuPortrait : MaximizeAppWindow(

    rotation = ROTATION_0,

    trigger = MaximizeDesktopAppTrigger.MAXIMIZE_BUTTON_IN_MENU

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppWithKeyboard.kt

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.flicker.annotation.FlickerConfigProvider 
import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper.MaximizeDesktopAppTrigger

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP

import com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test
@@ -35,7 +36,10 @@ import org.junit.runner.RunWith 
 * stable display bounds.

 */

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppWithKeyboard : MaximizeAppWindow(rotation = ROTATION_90, usingKeyboard = true) {

class MaximizeAppWithKeyboard : MaximizeAppWindow(

    rotation = ROTATION_90,

    trigger = MaximizeDesktopAppTrigger.KEYBOARD_SHORTCUT

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()