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

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

Merge "Move shared platform consts to PlatformConsts file" into udc-dev am: 953c9414 

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



Change-Id: Idfac481e76d8c65d889a79da5bd71056c0ebca1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0eebabd7 953c9414

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt

+5 −5
Original line number Diff line number Diff line
@@ -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()

    }