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

Commit ec229a1a authored Feb 16, 2024 by Nataniel Borges

Unify common into parser and flicker (Pt. 2)

Since winscope no longer uses flicker code, we don't need to compile
all the code to JS. This means we can reuse the standard Android
objects and simplify the code

This CL updates the import path removing the distinction between common
and device subpackages

Bug: 311642700
Test: atest FlickerLibTest FlickerLibUtilTests FlickerLibE2eTest
Change-Id: I06bb190ed0e60336390d5c7ea72c7585ac0ef90f

parent 889f7b99

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

+9 −9

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

	import android.internal.perfetto.protos.PerfettoTrace;		import android.internal.perfetto.protos.PerfettoTrace;
	import android.tools.common.ScenarioBuilder;		import android.tools.ScenarioBuilder;
	import android.tools.common.Tag;		import android.tools.Tag;
	import android.tools.common.io.TraceType;		import android.tools.io.TraceType;
	import android.tools.device.traces.TraceConfig;		import android.tools.traces.TraceConfig;
	import android.tools.device.traces.TraceConfigs;		import android.tools.traces.TraceConfigs;
	import android.tools.device.traces.io.ResultReader;		import android.tools.traces.io.ResultReader;
	import android.tools.device.traces.io.ResultWriter;		import android.tools.traces.io.ResultWriter;
	import android.tools.device.traces.monitors.PerfettoTraceMonitor;		import android.tools.traces.monitors.PerfettoTraceMonitor;
	import android.tools.device.traces.monitors.TraceMonitor;		import android.tools.traces.monitors.TraceMonitor;
	import android.util.proto.ProtoInputStream;		import android.util.proto.ProtoInputStream;
	import android.util.proto.ProtoOutputStream;		import android.util.proto.ProtoOutputStream;

tests/SurfaceViewBufferTests/src/com/android/test/BufferPresentationTests.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	*/		*/
	package com.android.test		package com.android.test

	import android.tools.common.flicker.subject.layers.LayersTraceSubject		import android.tools.flicker.subject.layers.LayersTraceSubject
	import junit.framework.Assert.assertEquals		import junit.framework.Assert.assertEquals
	import junit.framework.Assert.assertTrue		import junit.framework.Assert.assertTrue
	import org.junit.Test		import org.junit.Test

tests/SurfaceViewBufferTests/src/com/android/test/BufferRejectionTests.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@
	package com.android.test		package com.android.test

	import android.graphics.Point		import android.graphics.Point
	import android.tools.common.flicker.subject.layers.LayersTraceSubject		import android.tools.flicker.subject.layers.LayersTraceSubject
	import com.android.test.SurfaceViewBufferTestBase.Companion.ScalingMode		import com.android.test.SurfaceViewBufferTestBase.Companion.ScalingMode
	import com.android.test.SurfaceViewBufferTestBase.Companion.Transform		import com.android.test.SurfaceViewBufferTestBase.Companion.Transform
	import junit.framework.Assert.assertEquals		import junit.framework.Assert.assertEquals

tests/SurfaceViewBufferTests/src/com/android/test/GeometryTests.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@ import android.graphics.Color
	import android.graphics.Point		import android.graphics.Point
	import android.graphics.Rect		import android.graphics.Rect
	import android.os.SystemClock		import android.os.SystemClock
	import android.tools.common.flicker.subject.layers.LayersTraceSubject		import android.tools.flicker.subject.layers.LayersTraceSubject
	import com.android.test.SurfaceViewBufferTestBase.Companion.ScalingMode		import com.android.test.SurfaceViewBufferTestBase.Companion.ScalingMode
	import com.android.test.SurfaceViewBufferTestBase.Companion.Transform		import com.android.test.SurfaceViewBufferTestBase.Companion.Transform
	import junit.framework.Assert.assertEquals		import junit.framework.Assert.assertEquals

tests/SurfaceViewBufferTests/src/com/android/test/InverseDisplayTransformTests.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@
	package com.android.test		package com.android.test

	import android.graphics.Point		import android.graphics.Point
	import android.tools.common.flicker.subject.layers.LayersTraceSubject		import android.tools.flicker.subject.layers.LayersTraceSubject
	import com.android.test.SurfaceViewBufferTestBase.Companion.Transform		import com.android.test.SurfaceViewBufferTestBase.Companion.Transform
	import junit.framework.Assert.assertEquals		import junit.framework.Assert.assertEquals
	import org.junit.Assert		import org.junit.Assert