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

Commit e39203d6 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge changes I399e82b7,Ie399c733 into udc-dev am: 19f86ea6 

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



Change-Id: I6cfffef869905d4287759f9f37a5bbd0508452f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85e0af17 19f86ea6

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

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ fun FlickerTest.replacesLayer( 
            assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)

        }

        if (ignoreSplashscreen) {

            assertion.then().isSplashScreenVisibleFor(newLayer, isOptional = true)

            assertion.then().isSplashScreenVisibleFor(

                    ComponentNameMatcher(newLayer.packageName, className = ""), isOptional = true)

        }



        assertion.then().isVisible(newLayer)

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

+5 −2
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 


package com.android.server.wm.flicker.launch



import android.os.SystemClock

import android.platform.test.annotations.Postsubmit

import android.tools.device.apphelpers.CameraAppHelper

import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.apphelpers.StandardAppHelper

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

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

import android.tools.device.flicker.legacy.FlickerTest
@@ -54,13 +55,14 @@ import org.junit.runners.Parameterized 
 * ```

 */

@RequiresDevice

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) :

    OpenAppFromLauncherTransition(flicker) {

    private val cameraApp = CameraAppHelper(instrumentation)

    override val testApp: StandardAppHelper

        get() = cameraApp



    override val transition: FlickerBuilder.() -> Unit

        get() = {
@@ -70,6 +72,7 @@ class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) : 
            }

            transitions {

                device.pressKeyCode(KeyEvent.KEYCODE_POWER)

                SystemClock.sleep(100)

                device.pressKeyCode(KeyEvent.KEYCODE_POWER)

                wmHelper.StateSyncBuilder().withWindowSurfaceAppeared(cameraApp).waitForAndVerify()

            }