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

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

Merge "Ignore `Background for SurfaceView Camera` surface on test" into... 

Merge "Ignore `Background for SurfaceView Camera`  surface on test" into udc-qpr-dev am: 2a5dfadb am: 34116e8f

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



Change-Id: I3cd00ca8a48187ffd80c57d3572b0d8502156e5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 251ead17 34116e8f

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

+17 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.server.wm.flicker.launch 


import android.os.SystemClock

import android.platform.test.annotations.Postsubmit

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

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

import android.tools.device.apphelpers.CameraAppHelper

import android.tools.device.apphelpers.StandardAppHelper

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -137,8 +139,14 @@ class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: LegacyFlickerTest) 


    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        flicker.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS +

                    listOf(CAMERA_BACKGROUND)

            )

        }

    }



    @Postsubmit

    @Test
@@ -161,5 +169,12 @@ class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: LegacyFlickerTest) 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams() = LegacyFlickerTestFactory.nonRotationTests()



        private val CAMERA_BACKGROUND =

            ComponentNameMatcher(

                "Background for SurfaceView" +

                    "[com.google.android.GoogleCamera/" +

                    "com.google.android.apps.camera.legacy.app.activity.main.CameraActivity]"

            )

    }

}