From f344e269ff9e747030989d4e708fa2a8c7b4677d Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Wed, 3 May 2023 10:37:56 +0000 Subject: [PATCH] Move shared platform consts to PlatformConsts file Bug: 276431133 Test: atest FlickerLibTest Change-Id: Ide73b9e7c57792a724a74305fd0994a89ff6f8df --- .../wm/flicker/helpers/ActivityEmbeddingAppHelper.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt index 6053f1dc9319e..daecfe7e4c4d7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt @@ -17,8 +17,8 @@ package com.android.server.wm.flicker.helpers import android.app.Instrumentation +import android.tools.common.PlatformConsts import android.tools.common.traces.component.ComponentNameMatcher -import android.tools.common.traces.wm.WindowManagerState.Companion.STATE_RESUMED import android.tools.device.apphelpers.StandardAppHelper import android.tools.device.helpers.FIND_TIMEOUT import android.tools.device.traces.parsers.WindowManagerStateHelper @@ -54,8 +54,8 @@ constructor( launchButton.click() wmHelper .StateSyncBuilder() - .withActivityState(SECONDARY_ACTIVITY_COMPONENT, STATE_RESUMED) - .withActivityState(MAIN_ACTIVITY_COMPONENT, STATE_RESUMED) + .withActivityState(SECONDARY_ACTIVITY_COMPONENT, PlatformConsts.STATE_RESUMED) + .withActivityState(MAIN_ACTIVITY_COMPONENT, PlatformConsts.STATE_RESUMED) .waitForAndVerify() } @@ -73,8 +73,8 @@ constructor( launchButton.click() wmHelper .StateSyncBuilder() - .withActivityState(PLACEHOLDER_PRIMARY_COMPONENT, STATE_RESUMED) - .withActivityState(PLACEHOLDER_SECONDARY_COMPONENT, STATE_RESUMED) + .withActivityState(PLACEHOLDER_PRIMARY_COMPONENT, PlatformConsts.STATE_RESUMED) + .withActivityState(PLACEHOLDER_SECONDARY_COMPONENT, PlatformConsts.STATE_RESUMED) .waitForAndVerify() }