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

Commit 64463f92 authored by An An Yu's avatar An An Yu Committed by Automerger Merge Worker
Browse files

Merge "Mark some testcases in MainActivityStartsSecondaryWithAlwaysExpandTest...

Merge "Mark some testcases in MainActivityStartsSecondaryWithAlwaysExpandTest flaky" into udc-qpr-dev am: a2239704

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



Change-Id: I9680ada8100bb9b71bd53ee5a5ea7052ff739197
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c920e668 a2239704
Loading
Loading
Loading
Loading
+18 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

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

import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Presubmit
import android.tools.common.datatypes.Rect
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -65,6 +66,21 @@ class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: LegacyFlickerTest
        }
    }

    @FlakyTest(bugId = 286952194)
    @Presubmit
    @Test
    override fun navBarWindowIsVisibleAtStartAndEnd() {}

    @FlakyTest(bugId = 286952194)
    @Presubmit
    @Test
    override fun statusBarWindowIsAlwaysVisible() {}

    @FlakyTest(bugId = 286952194)
    @Presubmit
    @Test
    override fun statusBarLayerPositionAtStartAndEnd() {}

    /** Transition begins with a split. */
    @Presubmit
    @Test
@@ -110,6 +126,7 @@ class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: LegacyFlickerTest
    }

    /** Always expand activity is on top of the split. */
    @FlakyTest(bugId = 286952194)
    @Presubmit
    @Test
    fun endsWithAlwaysExpandActivityOnTop() {