Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6cfffef869905d4287759f9f37a5bbd0508452f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pablo Gamito
2023-03-04 13:05:40 +00:00
committed by Automerger Merge Worker
parent 85e0af17d7 19f86ea6a4
commit e39203d6e9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,8 @@ fun FlickerTest.replacesLayer(
assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true) assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)
} }
if (ignoreSplashscreen) { if (ignoreSplashscreen) {
assertion.then().isSplashScreenVisibleFor(newLayer, isOptional = true) assertion.then().isSplashScreenVisibleFor(
ComponentNameMatcher(newLayer.packageName, className = ""), isOptional = true)
} }
assertion.then().isVisible(newLayer) assertion.then().isVisible(newLayer)

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

@@ -16,9 +16,10 @@
package com.android.server.wm.flicker.launch package com.android.server.wm.flicker.launch
import android.os.SystemClock
import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Postsubmit
import android.tools.device.apphelpers.CameraAppHelper 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.junit.FlickerParametersRunnerFactory
import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerBuilder
import android.tools.device.flicker.legacy.FlickerTest import android.tools.device.flicker.legacy.FlickerTest
@@ -54,13 +55,14 @@ import org.junit.runners.Parameterized
* ``` * ```
*/ */
@RequiresDevice @RequiresDevice
@FlickerServiceCompatible
@RunWith(Parameterized::class) @RunWith(Parameterized::class)
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) : class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) :
OpenAppFromLauncherTransition(flicker) { OpenAppFromLauncherTransition(flicker) {
private val cameraApp = CameraAppHelper(instrumentation) private val cameraApp = CameraAppHelper(instrumentation)
override val testApp: StandardAppHelper
get() = cameraApp
override val transition: FlickerBuilder.() -> Unit override val transition: FlickerBuilder.() -> Unit
get() = { get() = {
@@ -70,6 +72,7 @@ class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) :
} }
transitions { transitions {
device.pressKeyCode(KeyEvent.KEYCODE_POWER) device.pressKeyCode(KeyEvent.KEYCODE_POWER)
SystemClock.sleep(100)
device.pressKeyCode(KeyEvent.KEYCODE_POWER) device.pressKeyCode(KeyEvent.KEYCODE_POWER)
wmHelper.StateSyncBuilder().withWindowSurfaceAppeared(cameraApp).waitForAndVerify() wmHelper.StateSyncBuilder().withWindowSurfaceAppeared(cameraApp).waitForAndVerify()
} }