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

Commit 59f841bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore nav bar at start on AOD for... 

Merge "Ignore nav bar at start on AOD for OpenAppFromLockscreenNotificationWithOverlayAppTest" into udc-qpr-dev am: 2e94cee9 am: 2955baa1

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



Change-Id: I742cf82976c834874be0fa3d88216ac35f6c54bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2765e14f 2955baa1

tests/FlickerTests/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationWithOverlayAppTest.kt

+3 −2
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.tools.device.helpers.wakeUpAndGoToHomeScreen 
import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

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

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.MethodSorters
@@ -106,9 +107,9 @@ class OpenAppFromLockscreenNotificationWithOverlayAppTest(flicker: LegacyFlicker 
        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.visibleLayersShownMoreThanOneConsecutiveEntry()





    /** {@inheritDoc} */

    /** {@inheritDoc} */

    @FlakyTest(bugId = 209599395)

    @Test

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()

    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")

    override fun navBarLayerIsVisibleAtStartAndEnd() {}





    /** {@inheritDoc} */

    /** {@inheritDoc} */

    @Presubmit

    @Presubmit