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

Commit 3ece70dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix linter issues" into udc-dev am: f4565f57 am: 65bc9a98 

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



Change-Id: I9bbdf40149c7044033925b10eaf1961fa6eb7356
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf099cce 65bc9a98

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import org.junit.runners.Parameterized 
 *     Select "Auto-enter PiP" radio button

 *     Press Home button or swipe up to go Home and put [pipApp] in pip mode

 * ```

 *

 * Notes:

 * ```

 *     1. All assertions are inherited from [EnterPipTest]

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

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import org.junit.runners.Parameterized 
 *     Launch an app in pip mode [pipApp],

 *     Swipe the pip window to the bottom-center of the screen and wait it disappear

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)

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

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import org.junit.runners.Parameterized 
 *     Click on the pip window

 *     Click on dismiss button and wait window disappear

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import org.junit.runners.Parameterized 
 *     Launch [pipApp] on a fixed landscape orientation

 *     Broadcast action [ACTION_ENTER_PIP] to enter pip mode

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)

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

+2 −8
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ abstract class EnterPipTransition(flicker: FlickerTest) : PipTransition(flicker) 
    @Presubmit

    @Test

    open fun pipAppLayerAlwaysVisible() {

        flicker.assertLayers {

            this.isVisible(pipApp)

        }

        flicker.assertLayers { this.isVisible(pipApp) }

    }



    /** Checks the content overlay appears then disappears during the animation */
@@ -55,11 +53,7 @@ abstract class EnterPipTransition(flicker: FlickerTest) : PipTransition(flicker) 
    open fun pipOverlayLayerAppearThenDisappear() {

        val overlay = ComponentNameMatcher.PIP_CONTENT_OVERLAY

        flicker.assertLayers {

            this.notContains(overlay)

                .then()

                .contains(overlay)

                .then()

                .notContains(overlay)

            this.notContains(overlay).then().contains(overlay).then().notContains(overlay)

        }

    }