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

Commit f71be21c authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes Ie29aa5ff,I865a769d into main 

* changes:
  Ensure rotation is correct in during QuickSwitchBetweenTwoAppsBackGesturalNavLandscape
  Update expacted scenarios for CloseAppBackButton
parents 88da89d2 ac69fa70

tests/FlickerTests/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonLandscape.kt

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ import org.junit.runner.RunWith 
@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CloseAppBackButton3ButtonLandscape :

    CloseAppBackButton(NavBar.MODE_3BUTTON, Rotation.ROTATION_90) {

    @ExpectedScenarios(["APP_CLOSE_TO_HOME"])

    // TODO: Missing CUJ (b/300078127)

    @ExpectedScenarios(["ENTIRE_TRACE"])

    @Test

    override fun closeAppBackButtonTest() = super.closeAppBackButtonTest()

tests/FlickerTests/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonPortrait.kt

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ import org.junit.runner.RunWith 
@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CloseAppBackButton3ButtonPortrait :

    CloseAppBackButton(NavBar.MODE_3BUTTON, Rotation.ROTATION_0) {

    @ExpectedScenarios(["APP_CLOSE_TO_HOME"])

    // TODO: Missing CUJ (b/300078127)

    @ExpectedScenarios(["ENTIRE_TRACE"])

    @Test

    override fun closeAppBackButtonTest() = super.closeAppBackButtonTest()

tests/FlickerTests/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavLandscape.kt

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ import org.junit.runner.RunWith 
@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CloseAppBackButtonGesturalNavLandscape :

    CloseAppBackButton(NavBar.MODE_GESTURAL, Rotation.ROTATION_90) {

    @ExpectedScenarios(["APP_CLOSE_TO_HOME"])

    // TODO: Missing CUJ (b/300078127)

    @ExpectedScenarios(["ENTIRE_TRACE"])

    @Test

    override fun closeAppBackButtonTest() = super.closeAppBackButtonTest()

tests/FlickerTests/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavPortrait.kt

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ import org.junit.runner.RunWith 
@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CloseAppBackButtonGesturalNavPortrait :

    CloseAppBackButton(NavBar.MODE_GESTURAL, Rotation.ROTATION_0) {

    @ExpectedScenarios(["APP_CLOSE_TO_HOME"])

    // TODO: Missing CUJ (b/300078127)

    @ExpectedScenarios(["ENTIRE_TRACE"])

    @Test

    override fun closeAppBackButtonTest() = super.closeAppBackButtonTest()

tests/FlickerTests/src/com/android/server/wm/flicker/service/quickswitch/scenarios/QuickSwitchBetweenTwoAppsBack.kt

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm.flicker.service.quickswitch.scenarios 
import android.app.Instrumentation

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.device.flicker.rules.ChangeDisplayOrientationRule

import android.tools.device.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import com.android.launcher3.tapl.LauncherInstrumentation
@@ -46,7 +47,9 @@ abstract class QuickSwitchBetweenTwoAppsBack(val rotation: Rotation = Rotation.R 
        tapl.setExpectedRotation(rotation.value)

        tapl.setIgnoreTaskbarVisibility(true)

        testApp1.launchViaIntent(wmHelper)

        ChangeDisplayOrientationRule.setRotation(rotation)

        testApp2.launchViaIntent(wmHelper)

        ChangeDisplayOrientationRule.setRotation(rotation)

    }



    @Test