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

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

Merge changes Id37b4be4,I9846ef34 into main 

* changes:
  Use correct timestamp for RegionSubject
  Make isInvisible ActivityEmbeddingSecondaryActivity check optional
parents 18092cb1 d0d0afc5

tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ fun LegacyFlickerTest.snapshotStartingWindowLayerCoversExactlyOnApp( 
                snapshotLayers

                    .mapNotNull { snapshotLayer -> snapshotLayer.layer.visibleRegion }

                    .toTypedArray()

            val snapshotRegion = RegionSubject(visibleAreas, timestamp)

            val snapshotRegion = RegionSubject(visibleAreas, it.timestamp)

            // Verify the size of snapshotRegion covers appVisibleRegion exactly in animation.

            if (snapshotRegion.region.isNotEmpty) {

                val appVisibleRegion = it.visibleRegion(component)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenTrampolineActivityTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -14,18 +14,18 @@ 
 * limitations under the License.

 */



package com.android.server.wm.flicker.activityembedding

package com.android.server.wm.flicker.activityembedding.open



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.tools.common.datatypes.Rect

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

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

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

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

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase

import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper

import org.junit.FixMethodOrder

import org.junit.Test
@@ -173,7 +173,8 @@ class OpenTrampolineActivityTest(flicker: LegacyFlickerTest) : ActivityEmbedding 
                        .coversExactly(startDisplayBounds)

                }

                .then()

                .isInvisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT)

                .isInvisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT,

                    isOptional = true)

                .then()

                .isVisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT)

        }