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

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

Merge changes from topic "empty-region-check-fix" into main 

* changes:
  Empty region should cover at most any provided region
  Mark test as Flaky
  Disable flaky test
parents 6603c879 c705acbd

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt

+19 −0
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.common.NavBar

import android.tools.common.flicker.subject.layers.LayersTraceSubject

import android.tools.common.flicker.subject.region.RegionSubject

import android.tools.common.traces.component.ComponentNameMatcher.Companion.WALLPAPER_BBQ_WRAPPER

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.LegacyFlickerTest
@@ -56,6 +60,21 @@ class UnlockKeyguardToSplitScreen(override val flicker: LegacyFlickerTest) : 
            thisTransition(this)

        }



    @Test

    @FlakyTest(bugId = 293578017)

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    // TODO(b/293578017) remove once that bug is resolve

    @Test

    @Presubmit

    fun visibleLayersShownMoreThanOneConsecutiveEntry_withoutWallpaper() =

        flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry(

            LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + listOf(

                WALLPAPER_BBQ_WRAPPER

            )

        ) }



    @Test

    fun splitScreenDividerIsVisibleAtEnd() {

        flicker.assertLayersEnd { this.isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT) }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/CommonAssertions.kt

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ fun LayerTraceEntrySubject.splitAppLayerBoundsSnapToDivider( 
        val dividerRegion =

            layer(SPLIT_SCREEN_DIVIDER_COMPONENT)?.visibleRegion?.region

                ?: error("$SPLIT_SCREEN_DIVIDER_COMPONENT component not found")

        visibleRegion(component).isNotEmpty()

        visibleRegion(component)

            .coversAtMost(

                if (displayBounds.width > displayBounds.height) {

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) : 
     * Checks that the [ComponentNameMatcher.NAV_BAR] starts the transition invisible, then becomes

     * visible during the unlocking animation and remains visible at the end of the transition

     */

    @Presubmit

    @FlakyTest(bugId = 293581770)

    @Test

    fun navBarWindowsVisibilityChanges() {

        Assume.assumeFalse(flicker.scenario.isTablet)