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

Commit d158f0d7 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-2625b945aa174137b2b2b5d408d07175" into tm-mainline-prod 

* changes:
  [automerge] Fix ExitPipWithDismissButtonTest#focusDoesNotChange 2p: 02c59f00
  Fix ExitPipWithDismissButtonTest#focusDoesNotChange
parents 96d671ff a141ec74

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

+0 −11
Original line number Diff line number Diff line
@@ -93,15 +93,4 @@ abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition 
                .isVisible(LAUNCHER_COMPONENT)

        }

    }



    /**

     * Checks that the focus doesn't change between windows during the transition

     */

    @Presubmit

    @Test

    open fun focusDoesNotChange() {

        testSpec.assertEventLog {

            this.focusDoesNotChange()

        }

    }

}

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

+11 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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
@@ -72,10 +73,17 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 215869110)

    /**

     * Checks that the focus changes between the pip menu window and the launcher when clicking the

     * dismiss button on pip menu to close the pip window.

     */

    @Presubmit

    @Test

    override fun focusDoesNotChange() = super.focusDoesNotChange()

    fun focusDoesNotChange() {

        testSpec.assertEventLog {

            this.focusChanges("PipMenuView", "NexusLauncherActivity")

        }

    }



    companion object {

        /**

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

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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
@@ -81,6 +82,17 @@ class ExitPipWithSwipeDownTest(testSpec: FlickerTestParameter) : ExitPipTransiti 
    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that the focus doesn't change between windows during the transition

     */

    @Presubmit

    @Test

    fun focusDoesNotChange() {

        testSpec.assertEventLog {

            this.focusDoesNotChange()

        }

    }



    companion object {

        /**

         * Creates the test configurations.