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

Commit beef4927 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge changes from topic "unify-common-flicker" into main 

* changes:
  Unify common into parser and flicker (Pt. 2)
  Unify common into parser and flicker
parents 619c0ef5 ec229a1a

core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java

+9 −9
Original line number Diff line number Diff line
@@ -24,15 +24,15 @@ import static java.io.File.createTempFile; 
import static java.nio.file.Files.createTempDirectory;



import android.internal.perfetto.protos.PerfettoTrace;

import android.tools.common.ScenarioBuilder;

import android.tools.common.Tag;

import android.tools.common.io.TraceType;

import android.tools.device.traces.TraceConfig;

import android.tools.device.traces.TraceConfigs;

import android.tools.device.traces.io.ResultReader;

import android.tools.device.traces.io.ResultWriter;

import android.tools.device.traces.monitors.PerfettoTraceMonitor;

import android.tools.device.traces.monitors.TraceMonitor;

import android.tools.ScenarioBuilder;

import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;

import android.tools.traces.TraceConfigs;

import android.tools.traces.io.ResultReader;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.monitors.PerfettoTraceMonitor;

import android.tools.traces.monitors.TraceMonitor;

import android.util.proto.ProtoInputStream;

import android.util.proto.ProtoOutputStream;

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/BaseAppCompat.kt

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
package com.android.wm.shell.flicker.appcompat



import android.content.Context

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

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

import android.tools.device.flicker.legacy.FlickerTestData

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.FlickerTestData

import android.tools.flicker.legacy.LegacyFlickerTest

import com.android.server.wm.flicker.helpers.LetterboxAppHelper

import com.android.server.wm.flicker.helpers.setRotation

import com.android.wm.shell.flicker.BaseTest

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt

+6 −6
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
package com.android.wm.shell.flicker.appcompat



import android.platform.test.annotations.Postsubmit

import android.tools.common.flicker.assertions.FlickerTest

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

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

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

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.flicker.assertions.FlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import org.junit.Test

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/OpenTransparentActivityTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
package com.android.wm.shell.flicker.appcompat



import android.platform.test.annotations.Postsubmit

import android.tools.common.Rotation

import android.tools.common.flicker.assertions.FlickerTest

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

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

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

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.Rotation

import android.tools.flicker.assertions.FlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import org.junit.Test

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/QuickSwitchLauncherToLetterboxAppTest.kt

+9 −9
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ package com.android.wm.shell.flicker.appcompat 


import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.common.datatypes.Rect

import android.tools.common.flicker.assertions.FlickerTest

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

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

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

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.NavBar

import android.tools.Rotation

import android.tools.datatypes.Rect

import android.tools.flicker.assertions.FlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith