Remove circular dependency between datatypes and traces package
Bug: 262241371
Test: atest FlickerLibTest
Change-Id: I5f0b408f28a74231d23f7826fdca217b158551e1
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/ComponentTemplate.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/ComponentTemplate.kt
index da2bd94..a23b5b8 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/ComponentTemplate.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/ComponentTemplate.kt
@@ -16,8 +16,8 @@
package android.tools.common.flicker.assertors
-import android.tools.common.datatypes.component.IComponentMatcher
import android.tools.common.flicker.IScenarioInstance
+import android.tools.common.traces.component.IComponentMatcher
data class ComponentTemplate(
val name: String,
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/Components.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/Components.kt
index 259c5bf..f4d2611 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/Components.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/Components.kt
@@ -16,11 +16,11 @@
package android.tools.common.flicker.assertors
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.FullComponentIdMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.config.FaasScenarioType
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.FullComponentIdMatcher
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.common.traces.wm.Transition
import android.tools.common.traces.wm.TransitionType
@@ -76,12 +76,14 @@
when (scenarioInstance.type) {
FaasScenarioType.SPLIT_SCREEN_ENTER -> {
TODO(
- "Not implemented :: ${scenarioInstance.type} :: ${scenarioInstance.associatedTransition}"
+ "Not implemented :: ${scenarioInstance.type} :: " +
+ "${scenarioInstance.associatedTransition}"
)
}
FaasScenarioType.SPLIT_SCREEN_EXIT -> {
TODO(
- "Not implemented :: ${scenarioInstance.type} :: ${scenarioInstance.associatedTransition}"
+ "Not implemented :: ${scenarioInstance.type} :: " +
+ "${scenarioInstance.associatedTransition}"
)
}
FaasScenarioType.SPLIT_SCREEN_RESIZE -> {
@@ -101,12 +103,14 @@
when (scenarioInstance.type) {
FaasScenarioType.SPLIT_SCREEN_ENTER -> {
TODO(
- "Not implemented :: ${scenarioInstance.type} :: ${scenarioInstance.associatedTransition}"
+ "Not implemented :: ${scenarioInstance.type} :: " +
+ "${scenarioInstance.associatedTransition}"
)
}
FaasScenarioType.SPLIT_SCREEN_EXIT -> {
TODO(
- "Not implemented :: ${scenarioInstance.type} :: ${scenarioInstance.associatedTransition}"
+ "Not implemented :: ${scenarioInstance.type} :: " +
+ "${scenarioInstance.associatedTransition}"
)
}
FaasScenarioType.SPLIT_SCREEN_RESIZE -> {
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerBecomesVisible.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerBecomesVisible.kt
index 460d410..4321869 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerBecomesVisible.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerBecomesVisible.kt
@@ -16,10 +16,10 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks that the app layer doesn't exist or is invisible at the start of the transition, but is
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerReplacesLauncher.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerReplacesLauncher.kt
index 57f4e23..e0b399f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerReplacesLauncher.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppLayerReplacesLauncher.kt
@@ -16,10 +16,10 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Asserts that:
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesTopWindow.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesTopWindow.kt
index cb98ed5..5f5eef6 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesTopWindow.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesTopWindow.kt
@@ -16,10 +16,10 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.wm.WindowManagerTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks that the app layer doesn't exist or is invisible at the start of the transition, but is
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesVisible.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesVisible.kt
index e495edd..26ac894 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesVisible.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowBecomesVisible.kt
@@ -16,10 +16,10 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.wm.WindowManagerTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks that the app layer doesn't exist or is invisible at the start of the transition, but is
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowReplacesLauncherAsTopWindow.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowReplacesLauncherAsTopWindow.kt
index 86e8573..0ca628b 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowReplacesLauncherAsTopWindow.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/AppWindowReplacesLauncherAsTopWindow.kt
@@ -16,11 +16,11 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.assertors.Components
import android.tools.common.flicker.subject.wm.WindowManagerTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks that [Components.LAUNCHER] is the top visible app window at the start of the transition
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/FocusChanges.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/FocusChanges.kt
index 2f660fc..006a254 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/FocusChanges.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/FocusChanges.kt
@@ -16,11 +16,11 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.events.EventLogSubject
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentNameMatcher
val ANY_MATCH_COMPONENT = ComponentTemplate("ANY") { _ -> ComponentNameMatcher("", "") }
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherReplacesAppLayer.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherReplacesAppLayer.kt
index 99ac3eb..27f3a6b 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherReplacesAppLayer.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherReplacesAppLayer.kt
@@ -16,10 +16,10 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Asserts that:
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherWindowReplacesAppAsTopWindow.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherWindowReplacesAppAsTopWindow.kt
index ce9dd85..bccb48b 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherWindowReplacesAppAsTopWindow.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/LauncherWindowReplacesAppAsTopWindow.kt
@@ -16,11 +16,11 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.assertors.Components
import android.tools.common.flicker.subject.wm.WindowManagerTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks that [component] is the top visible app window at the start of the transition and that it
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/RotationLayerAppearsAndVanishes.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/RotationLayerAppearsAndVanishes.kt
index bd1831c..e9b2ece 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/RotationLayerAppearsAndVanishes.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/RotationLayerAppearsAndVanishes.kt
@@ -16,10 +16,10 @@
package android.tools.common.flicker.assertors.assertions
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.ComponentTemplate
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks that the [ComponentNameMatcher.ROTATION] layer appears during the transition, doesn't
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtEnd.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtEnd.kt
index 87810b9..2ca318a 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtEnd.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtEnd.kt
@@ -18,10 +18,10 @@
import android.tools.common.PlatformConsts
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.AssertionTemplate
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks if the [ComponentNameMatcher.STATUS_BAR] layer is placed at the correct position at the
diff --git a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtStart.kt b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtStart.kt
index 4cc7b56..5d1ecdd 100644
--- a/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtStart.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/assertors/assertions/StatusBarLayerPositionAtStart.kt
@@ -18,10 +18,10 @@
import android.tools.common.PlatformConsts
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.IScenarioInstance
import android.tools.common.flicker.assertors.AssertionTemplate
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Checks if the [ComponentNameMatcher.STATUS_BAR] layer is placed at the correct position at the
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/TransitionFilters.kt b/libraries/flicker/src/android/tools/common/flicker/config/TransitionFilters.kt
index 9ab3543..eee2406 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/TransitionFilters.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/TransitionFilters.kt
@@ -16,8 +16,8 @@
package android.tools.common.flicker.config
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.extractors.TransitionsTransform
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.common.traces.wm.Transition
import android.tools.common.traces.wm.TransitionType
diff --git a/libraries/flicker/src/android/tools/common/flicker/subject/layers/ILayerSubject.kt b/libraries/flicker/src/android/tools/common/flicker/subject/layers/ILayerSubject.kt
index 5a82c19..6932055 100644
--- a/libraries/flicker/src/android/tools/common/flicker/subject/layers/ILayerSubject.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/subject/layers/ILayerSubject.kt
@@ -16,8 +16,8 @@
package android.tools.common.flicker.subject.layers
-import android.tools.common.datatypes.component.IComponentMatcher
-import android.tools.common.datatypes.component.IComponentNameMatcher
+import android.tools.common.traces.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentNameMatcher
import android.tools.common.traces.surfaceflinger.Display
import android.tools.common.traces.surfaceflinger.Layer
diff --git a/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayerTraceEntrySubject.kt b/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayerTraceEntrySubject.kt
index 84ec00d..464bf5a 100644
--- a/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayerTraceEntrySubject.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayerTraceEntrySubject.kt
@@ -17,9 +17,6 @@
package android.tools.common.flicker.subject.layers
import android.tools.common.datatypes.Color
-import android.tools.common.datatypes.component.ComponentSplashScreenMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
-import android.tools.common.datatypes.component.IComponentNameMatcher
import android.tools.common.flicker.assertions.Fact
import android.tools.common.flicker.subject.FlickerSubject
import android.tools.common.flicker.subject.exceptions.ExceptionMessageBuilder
@@ -28,6 +25,9 @@
import android.tools.common.flicker.subject.exceptions.InvalidPropertyException
import android.tools.common.flicker.subject.region.RegionSubject
import android.tools.common.io.IReader
+import android.tools.common.traces.component.ComponentSplashScreenMatcher
+import android.tools.common.traces.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentNameMatcher
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.surfaceflinger.LayerTraceEntry
import android.tools.common.traces.surfaceflinger.LayersTrace
diff --git a/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayersTraceSubject.kt b/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayersTraceSubject.kt
index 1f46900..011ac59 100644
--- a/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayersTraceSubject.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/subject/layers/LayersTraceSubject.kt
@@ -16,16 +16,16 @@
package android.tools.common.flicker.subject.layers
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.EdgeExtensionComponentMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
-import android.tools.common.datatypes.component.IComponentNameMatcher
import android.tools.common.flicker.subject.FlickerTraceSubject
import android.tools.common.flicker.subject.exceptions.ExceptionMessageBuilder
import android.tools.common.flicker.subject.exceptions.InvalidElementException
import android.tools.common.flicker.subject.exceptions.InvalidPropertyException
import android.tools.common.flicker.subject.region.RegionTraceSubject
import android.tools.common.io.IReader
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.EdgeExtensionComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentNameMatcher
import android.tools.common.traces.region.RegionTrace
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.surfaceflinger.LayersTrace
diff --git a/libraries/flicker/src/android/tools/common/flicker/subject/wm/IWindowManagerSubject.kt b/libraries/flicker/src/android/tools/common/flicker/subject/wm/IWindowManagerSubject.kt
index abf2693..6ff624f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/subject/wm/IWindowManagerSubject.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/subject/wm/IWindowManagerSubject.kt
@@ -18,7 +18,7 @@
import android.tools.common.PlatformConsts
import android.tools.common.Rotation
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.common.traces.wm.Activity
import android.tools.common.traces.wm.DisplayContent
import android.tools.common.traces.wm.WindowState
diff --git a/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubject.kt b/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubject.kt
index 8af566b..308e24c 100644
--- a/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubject.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubject.kt
@@ -18,8 +18,6 @@
import android.tools.common.Rotation
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
import android.tools.common.flicker.assertions.Fact
import android.tools.common.flicker.subject.FlickerSubject
import android.tools.common.flicker.subject.exceptions.ExceptionMessageBuilder
@@ -29,6 +27,8 @@
import android.tools.common.flicker.subject.exceptions.SubjectAssertionError
import android.tools.common.flicker.subject.region.RegionSubject
import android.tools.common.io.IReader
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.common.traces.wm.WindowManagerState
import android.tools.common.traces.wm.WindowState
diff --git a/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubject.kt b/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubject.kt
index b12aecf..0124883 100644
--- a/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubject.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubject.kt
@@ -17,11 +17,11 @@
package android.tools.common.flicker.subject.wm
import android.tools.common.Rotation
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
import android.tools.common.flicker.subject.FlickerTraceSubject
import android.tools.common.flicker.subject.region.RegionTraceSubject
import android.tools.common.io.IReader
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.common.traces.region.RegionTrace
import android.tools.common.traces.wm.WindowManagerTrace
import android.tools.common.traces.wm.WindowState
diff --git a/libraries/flicker/src/android/tools/common/traces/ConditionsFactory.kt b/libraries/flicker/src/android/tools/common/traces/ConditionsFactory.kt
index b4f9bc8..6663a54 100644
--- a/libraries/flicker/src/android/tools/common/traces/ConditionsFactory.kt
+++ b/libraries/flicker/src/android/tools/common/traces/ConditionsFactory.kt
@@ -18,8 +18,8 @@
import android.tools.common.PlatformConsts
import android.tools.common.Rotation
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.surfaceflinger.Transform
import android.tools.common.traces.surfaceflinger.Transform.Companion.isFlagSet
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/ComponentName.kt b/libraries/flicker/src/android/tools/common/traces/component/ComponentName.kt
similarity index 98%
rename from libraries/flicker/src/android/tools/common/datatypes/component/ComponentName.kt
rename to libraries/flicker/src/android/tools/common/traces/component/ComponentName.kt
index de61c71..5f8baa5 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/ComponentName.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/ComponentName.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/ComponentNameMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/ComponentNameMatcher.kt
similarity index 99%
rename from libraries/flicker/src/android/tools/common/datatypes/component/ComponentNameMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/ComponentNameMatcher.kt
index 1b68ebc..be1a974 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/ComponentNameMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/ComponentNameMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/ComponentSplashScreenMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/ComponentSplashScreenMatcher.kt
similarity index 98%
rename from libraries/flicker/src/android/tools/common/datatypes/component/ComponentSplashScreenMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/ComponentSplashScreenMatcher.kt
index eec3b2f..d31b405 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/ComponentSplashScreenMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/ComponentSplashScreenMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/EdgeExtensionComponentMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/EdgeExtensionComponentMatcher.kt
similarity index 97%
rename from libraries/flicker/src/android/tools/common/datatypes/component/EdgeExtensionComponentMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/EdgeExtensionComponentMatcher.kt
index a4ad74e..860846c 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/EdgeExtensionComponentMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/EdgeExtensionComponentMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/ExactComponentIdMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/ExactComponentIdMatcher.kt
similarity index 97%
rename from libraries/flicker/src/android/tools/common/datatypes/component/ExactComponentIdMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/ExactComponentIdMatcher.kt
index 6f9231f..320d270 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/ExactComponentIdMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/ExactComponentIdMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/FullComponentIdMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/FullComponentIdMatcher.kt
similarity index 97%
rename from libraries/flicker/src/android/tools/common/datatypes/component/FullComponentIdMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/FullComponentIdMatcher.kt
index fa90492..6e3d2d6 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/FullComponentIdMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/FullComponentIdMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/IComponentMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/IComponentMatcher.kt
similarity index 98%
rename from libraries/flicker/src/android/tools/common/datatypes/component/IComponentMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/IComponentMatcher.kt
index ba0f6ed..8feea3d 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/IComponentMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/IComponentMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/IComponentName.kt b/libraries/flicker/src/android/tools/common/traces/component/IComponentName.kt
similarity index 94%
rename from libraries/flicker/src/android/tools/common/datatypes/component/IComponentName.kt
rename to libraries/flicker/src/android/tools/common/traces/component/IComponentName.kt
index fc98f8a..64c733e 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/IComponentName.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/IComponentName.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/IComponentNameMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/IComponentNameMatcher.kt
similarity index 96%
rename from libraries/flicker/src/android/tools/common/datatypes/component/IComponentNameMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/IComponentNameMatcher.kt
index 564f1ab..8cb7403 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/IComponentNameMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/IComponentNameMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/datatypes/component/OrComponentMatcher.kt b/libraries/flicker/src/android/tools/common/traces/component/OrComponentMatcher.kt
similarity index 98%
rename from libraries/flicker/src/android/tools/common/datatypes/component/OrComponentMatcher.kt
rename to libraries/flicker/src/android/tools/common/traces/component/OrComponentMatcher.kt
index dae8cd4..282d510 100644
--- a/libraries/flicker/src/android/tools/common/datatypes/component/OrComponentMatcher.kt
+++ b/libraries/flicker/src/android/tools/common/traces/component/OrComponentMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.tools.common.datatypes.component
+package android.tools.common.traces.component
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/src/android/tools/common/traces/region/RegionTrace.kt b/libraries/flicker/src/android/tools/common/traces/region/RegionTrace.kt
index fbce435..4ccecb0 100644
--- a/libraries/flicker/src/android/tools/common/traces/region/RegionTrace.kt
+++ b/libraries/flicker/src/android/tools/common/traces/region/RegionTrace.kt
@@ -18,7 +18,7 @@
import android.tools.common.ITrace
import android.tools.common.Timestamp
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsName
/**
diff --git a/libraries/flicker/src/android/tools/common/traces/surfaceflinger/Layer.kt b/libraries/flicker/src/android/tools/common/traces/surfaceflinger/Layer.kt
index 31b57ba..66bcd02 100644
--- a/libraries/flicker/src/android/tools/common/traces/surfaceflinger/Layer.kt
+++ b/libraries/flicker/src/android/tools/common/traces/surfaceflinger/Layer.kt
@@ -21,7 +21,7 @@
import android.tools.common.datatypes.Rect
import android.tools.common.datatypes.RectF
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentName
+import android.tools.common.traces.component.ComponentName
import kotlin.js.JsExport
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/traces/surfaceflinger/LayerTraceEntry.kt b/libraries/flicker/src/android/tools/common/traces/surfaceflinger/LayerTraceEntry.kt
index 9971310..0ed45d8 100644
--- a/libraries/flicker/src/android/tools/common/traces/surfaceflinger/LayerTraceEntry.kt
+++ b/libraries/flicker/src/android/tools/common/traces/surfaceflinger/LayerTraceEntry.kt
@@ -20,8 +20,8 @@
import android.tools.common.ITraceEntry
import android.tools.common.datatypes.Rect
import android.tools.common.datatypes.RectF
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsExport
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/traces/wm/Activity.kt b/libraries/flicker/src/android/tools/common/traces/wm/Activity.kt
index 16367e0..6ecb62d 100644
--- a/libraries/flicker/src/android/tools/common/traces/wm/Activity.kt
+++ b/libraries/flicker/src/android/tools/common/traces/wm/Activity.kt
@@ -16,7 +16,7 @@
package android.tools.common.traces.wm
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsExport
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/traces/wm/DisplayArea.kt b/libraries/flicker/src/android/tools/common/traces/wm/DisplayArea.kt
index c61b28f..3ecd4ad 100644
--- a/libraries/flicker/src/android/tools/common/traces/wm/DisplayArea.kt
+++ b/libraries/flicker/src/android/tools/common/traces/wm/DisplayArea.kt
@@ -16,7 +16,7 @@
package android.tools.common.traces.wm
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsExport
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/traces/wm/DisplayContent.kt b/libraries/flicker/src/android/tools/common/traces/wm/DisplayContent.kt
index f74f522..405726b 100644
--- a/libraries/flicker/src/android/tools/common/traces/wm/DisplayContent.kt
+++ b/libraries/flicker/src/android/tools/common/traces/wm/DisplayContent.kt
@@ -18,7 +18,7 @@
import android.tools.common.Rotation
import android.tools.common.datatypes.Rect
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsExport
import kotlin.js.JsName
import kotlin.math.min
diff --git a/libraries/flicker/src/android/tools/common/traces/wm/Task.kt b/libraries/flicker/src/android/tools/common/traces/wm/Task.kt
index eb01f25..36fad4f 100644
--- a/libraries/flicker/src/android/tools/common/traces/wm/Task.kt
+++ b/libraries/flicker/src/android/tools/common/traces/wm/Task.kt
@@ -17,7 +17,7 @@
package android.tools.common.traces.wm
import android.tools.common.datatypes.Rect
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsExport
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/common/traces/wm/WindowManagerState.kt b/libraries/flicker/src/android/tools/common/traces/wm/WindowManagerState.kt
index 782f4fb..c97a88f 100644
--- a/libraries/flicker/src/android/tools/common/traces/wm/WindowManagerState.kt
+++ b/libraries/flicker/src/android/tools/common/traces/wm/WindowManagerState.kt
@@ -19,7 +19,7 @@
import android.tools.common.CrossPlatform
import android.tools.common.ITraceEntry
import android.tools.common.Rotation
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
import kotlin.js.JsExport
import kotlin.js.JsName
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/BrowserAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/BrowserAppHelper.kt
index 56bd651..2d90963 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/BrowserAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/BrowserAppHelper.kt
@@ -20,7 +20,7 @@
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Helper to launch the default browser app (compatible with AOSP)
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/CalculatorAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/CalculatorAppHelper.kt
index bee7727..48c2487 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/CalculatorAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/CalculatorAppHelper.kt
@@ -17,7 +17,7 @@
package android.tools.device.apphelpers
import android.app.Instrumentation
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Helper to launch the calculator app (not compatible with AOSP)
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/CalendarAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/CalendarAppHelper.kt
index 566669c..55529e1 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/CalendarAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/CalendarAppHelper.kt
@@ -21,7 +21,7 @@
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.net.Uri
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/** Helper to launch the Calendar app. */
class CalendarAppHelper
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/CameraAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/CameraAppHelper.kt
index c033cc8..9728042 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/CameraAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/CameraAppHelper.kt
@@ -21,7 +21,7 @@
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.provider.MediaStore
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/** Helper to launch the Camera app. */
class CameraAppHelper
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/ClockAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/ClockAppHelper.kt
index 9cf516c..08ce479 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/ClockAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/ClockAppHelper.kt
@@ -21,7 +21,7 @@
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.provider.AlarmClock
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/** Helper to launch the Camera app. */
class ClockAppHelper
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/GmailAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/GmailAppHelper.kt
index 4519ceb..cff1083 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/GmailAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/GmailAppHelper.kt
@@ -17,7 +17,7 @@
package android.tools.device.apphelpers
import android.app.Instrumentation
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/** Helper to launch the Gmail app (not compatible with AOSP) */
class GmailAppHelper(instrumentation: Instrumentation) :
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/MapsAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/MapsAppHelper.kt
index 5987b42..ed9778d 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/MapsAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/MapsAppHelper.kt
@@ -21,7 +21,7 @@
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.net.Uri
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/** Helper to launch the Maps app (not compatible with AOSP) */
class MapsAppHelper
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/MessagingAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/MessagingAppHelper.kt
index 294f3eb..051d0a0 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/MessagingAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/MessagingAppHelper.kt
@@ -20,7 +20,7 @@
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Helper to launch the default messaging app (compatible with AOSP)
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/StandardAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/StandardAppHelper.kt
index b8a7ed7..c016018 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/StandardAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/StandardAppHelper.kt
@@ -24,12 +24,12 @@
import android.content.pm.PackageManager
import android.platform.helpers.AbstractStandardAppHelper
import android.tools.common.CrossPlatform
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentMatcher
-import android.tools.common.datatypes.component.IComponentNameMatcher
import android.tools.common.traces.Condition
import android.tools.common.traces.ConditionsFactory
import android.tools.common.traces.DeviceStateDump
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentNameMatcher
import android.tools.common.traces.wm.WindowManagerState
import android.tools.device.traces.parsers.WindowManagerStateHelper
import androidx.test.uiautomator.By
diff --git a/libraries/flicker/src/android/tools/device/apphelpers/YouTubeAppHelper.kt b/libraries/flicker/src/android/tools/device/apphelpers/YouTubeAppHelper.kt
index 87cfee1..993ecab 100644
--- a/libraries/flicker/src/android/tools/device/apphelpers/YouTubeAppHelper.kt
+++ b/libraries/flicker/src/android/tools/device/apphelpers/YouTubeAppHelper.kt
@@ -20,7 +20,7 @@
import android.content.Intent
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
/**
* Helper to launch Youtube (not compatible with AOSP)
diff --git a/libraries/flicker/src/android/tools/device/flicker/Utils.kt b/libraries/flicker/src/android/tools/device/flicker/Utils.kt
index 3c7a838..ace10aa 100644
--- a/libraries/flicker/src/android/tools/device/flicker/Utils.kt
+++ b/libraries/flicker/src/android/tools/device/flicker/Utils.kt
@@ -17,7 +17,7 @@
package android.tools.device.flicker
import android.tools.common.IScenario
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.device.traces.DEFAULT_TRACE_CONFIG
import android.tools.device.traces.io.ResultReader
import android.tools.device.traces.io.ResultWriter
diff --git a/libraries/flicker/src/android/tools/device/flicker/legacy/FlickerTest.kt b/libraries/flicker/src/android/tools/device/flicker/legacy/FlickerTest.kt
index e671181..60d5c3b 100644
--- a/libraries/flicker/src/android/tools/device/flicker/legacy/FlickerTest.kt
+++ b/libraries/flicker/src/android/tools/device/flicker/legacy/FlickerTest.kt
@@ -21,7 +21,6 @@
import android.tools.common.Scenario
import android.tools.common.ScenarioBuilder
import android.tools.common.Tag
-import android.tools.common.datatypes.component.IComponentMatcher
import android.tools.common.flicker.assertions.AssertionData
import android.tools.common.flicker.assertions.SubjectsParser
import android.tools.common.flicker.subject.FlickerSubject
@@ -33,6 +32,7 @@
import android.tools.common.flicker.subject.wm.WindowManagerStateSubject
import android.tools.common.flicker.subject.wm.WindowManagerTraceSubject
import android.tools.common.io.IReader
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.device.flicker.assertions.AssertionDataFactory
import android.tools.device.flicker.assertions.AssertionStateDataFactory
import android.tools.device.flicker.assertions.BaseAssertionRunner
diff --git a/libraries/flicker/src/android/tools/device/flicker/rules/LaunchAppRule.kt b/libraries/flicker/src/android/tools/device/flicker/rules/LaunchAppRule.kt
index 14d55fb..1d3e415 100644
--- a/libraries/flicker/src/android/tools/device/flicker/rules/LaunchAppRule.kt
+++ b/libraries/flicker/src/android/tools/device/flicker/rules/LaunchAppRule.kt
@@ -19,7 +19,7 @@
import android.app.Instrumentation
import android.tools.common.CrossPlatform
import android.tools.common.FLICKER_TAG
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.device.apphelpers.StandardAppHelper
import android.tools.device.traces.parsers.WindowManagerStateHelper
import androidx.test.platform.app.InstrumentationRegistry
diff --git a/libraries/flicker/src/android/tools/device/helpers/AutomationUtils.kt b/libraries/flicker/src/android/tools/device/helpers/AutomationUtils.kt
index 56940d3..1ea4ea3 100644
--- a/libraries/flicker/src/android/tools/device/helpers/AutomationUtils.kt
+++ b/libraries/flicker/src/android/tools/device/helpers/AutomationUtils.kt
@@ -24,8 +24,8 @@
import android.os.SystemClock
import android.tools.common.CrossPlatform
import android.tools.common.Rotation
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.traces.ConditionsFactory
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.device.helpers.WindowUtils.displayBounds
import android.tools.device.helpers.WindowUtils.estimateNavigationBarPosition
import android.tools.device.traces.executeShellCommand
diff --git a/libraries/flicker/src/android/tools/device/traces/parsers/Extensions.kt b/libraries/flicker/src/android/tools/device/traces/parsers/Extensions.kt
index e99ec19..4e04bb7 100644
--- a/libraries/flicker/src/android/tools/device/traces/parsers/Extensions.kt
+++ b/libraries/flicker/src/android/tools/device/traces/parsers/Extensions.kt
@@ -20,7 +20,7 @@
import android.content.ComponentName
import android.tools.common.datatypes.Rect
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
fun Rect.toAndroidRect(): android.graphics.Rect {
return android.graphics.Rect(left, top, right, bottom)
diff --git a/libraries/flicker/src/android/tools/device/traces/parsers/WaitForValidActivityState.kt b/libraries/flicker/src/android/tools/device/traces/parsers/WaitForValidActivityState.kt
index 835baf9..042b6f2 100644
--- a/libraries/flicker/src/android/tools/device/traces/parsers/WaitForValidActivityState.kt
+++ b/libraries/flicker/src/android/tools/device/traces/parsers/WaitForValidActivityState.kt
@@ -18,7 +18,7 @@
import android.app.ActivityTaskManager
import android.app.WindowConfiguration
-import android.tools.common.datatypes.component.IComponentMatcher
+import android.tools.common.traces.component.IComponentMatcher
data class WaitForValidActivityState(
@JvmField val activityMatcher: IComponentMatcher?,
diff --git a/libraries/flicker/src/android/tools/device/traces/parsers/WindowManagerStateHelper.kt b/libraries/flicker/src/android/tools/device/traces/parsers/WindowManagerStateHelper.kt
index 716d0f7..0a84008 100644
--- a/libraries/flicker/src/android/tools/device/traces/parsers/WindowManagerStateHelper.kt
+++ b/libraries/flicker/src/android/tools/device/traces/parsers/WindowManagerStateHelper.kt
@@ -24,17 +24,17 @@
import android.tools.common.CrossPlatform
import android.tools.common.Rotation
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.ComponentNameMatcher.Companion.IME
-import android.tools.common.datatypes.component.ComponentNameMatcher.Companion.LAUNCHER
-import android.tools.common.datatypes.component.ComponentNameMatcher.Companion.SNAPSHOT
-import android.tools.common.datatypes.component.ComponentNameMatcher.Companion.SPLASH_SCREEN
-import android.tools.common.datatypes.component.ComponentNameMatcher.Companion.SPLIT_DIVIDER
-import android.tools.common.datatypes.component.IComponentMatcher
import android.tools.common.traces.Condition
import android.tools.common.traces.ConditionsFactory
import android.tools.common.traces.DeviceStateDump
import android.tools.common.traces.WaitCondition
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher.Companion.IME
+import android.tools.common.traces.component.ComponentNameMatcher.Companion.LAUNCHER
+import android.tools.common.traces.component.ComponentNameMatcher.Companion.SNAPSHOT
+import android.tools.common.traces.component.ComponentNameMatcher.Companion.SPLASH_SCREEN
+import android.tools.common.traces.component.ComponentNameMatcher.Companion.SPLIT_DIVIDER
+import android.tools.common.traces.component.IComponentMatcher
import android.tools.common.traces.surfaceflinger.LayerTraceEntry
import android.tools.common.traces.surfaceflinger.LayersTrace
import android.tools.common.traces.wm.Activity
diff --git a/libraries/flicker/test/src/android/tools/TestComponents.kt b/libraries/flicker/test/src/android/tools/TestComponents.kt
index f5d1d43..c221413 100644
--- a/libraries/flicker/test/src/android/tools/TestComponents.kt
+++ b/libraries/flicker/test/src/android/tools/TestComponents.kt
@@ -18,7 +18,7 @@
package android.tools
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
internal object TestComponents {
@JvmStatic
diff --git a/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayerTraceEntrySubjectTest.kt b/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayerTraceEntrySubjectTest.kt
index b830a27..757255c 100644
--- a/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayerTraceEntrySubjectTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayerTraceEntrySubjectTest.kt
@@ -24,10 +24,10 @@
import android.tools.common.Cache
import android.tools.common.datatypes.Rect
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.OrComponentMatcher
import android.tools.common.flicker.subject.layers.LayerTraceEntrySubject
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.OrComponentMatcher
import android.tools.getLayerTraceReaderFromAsset
import android.tools.utils.MockLayerBuilder
import android.tools.utils.MockLayerTraceEntryBuilder
diff --git a/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayersTraceSubjectTest.kt b/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayersTraceSubjectTest.kt
index 946ce5a..17ad3cc 100644
--- a/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayersTraceSubjectTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/flicker/subject/surfaceflinger/LayersTraceSubjectTest.kt
@@ -23,9 +23,9 @@
import android.tools.assertThrows
import android.tools.common.Cache
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.subject.layers.LayersTraceSubject
import android.tools.common.io.IReader
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.getLayerTraceReaderFromAsset
import androidx.test.filters.FlakyTest
import com.google.common.truth.Truth
diff --git a/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubjectTest.kt b/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubjectTest.kt
index 07568c6..0fedf59 100644
--- a/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubjectTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerStateSubjectTest.kt
@@ -23,7 +23,7 @@
import android.tools.assertThrows
import android.tools.common.Cache
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.common.traces.wm.ConfigurationContainer
import android.tools.common.traces.wm.KeyguardControllerState
import android.tools.common.traces.wm.RootWindowContainer
diff --git a/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubjectTest.kt b/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubjectTest.kt
index 6a9c377..1e461bc 100644
--- a/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubjectTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/flicker/subject/wm/WindowManagerTraceSubjectTest.kt
@@ -21,7 +21,7 @@
import android.tools.assertThatErrorContainsDebugInfo
import android.tools.assertThrows
import android.tools.common.Cache
-import android.tools.common.datatypes.component.ComponentNameMatcher
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.getWmTraceReaderFromAsset
import com.google.common.truth.Truth
import org.junit.Before
diff --git a/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceEntryTest.kt b/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceEntryTest.kt
index 89a198f..4464bd7 100644
--- a/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceEntryTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceEntryTest.kt
@@ -22,8 +22,8 @@
import android.tools.assertThrows
import android.tools.common.Cache
import android.tools.common.CrossPlatform
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.getLayerTraceReaderFromAsset
import com.google.common.truth.Truth
import org.junit.Before
diff --git a/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceTest.kt b/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceTest.kt
index 669504d..6cbca2c 100644
--- a/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/traces/surfaceflinger/LayersTraceTest.kt
@@ -21,8 +21,8 @@
import android.tools.assertThrows
import android.tools.common.Cache
import android.tools.common.CrossPlatform
-import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.common.flicker.subject.layers.LayersTraceSubject
+import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.getLayerTraceReaderFromAsset
import com.google.common.truth.Truth
import org.junit.Before
diff --git a/libraries/flicker/test/src/android/tools/device/traces/parsers/WindowManagerStateHelperTest.kt b/libraries/flicker/test/src/android/tools/device/traces/parsers/WindowManagerStateHelperTest.kt
index 1e61ff9..0476cc3 100644
--- a/libraries/flicker/test/src/android/tools/device/traces/parsers/WindowManagerStateHelperTest.kt
+++ b/libraries/flicker/test/src/android/tools/device/traces/parsers/WindowManagerStateHelperTest.kt
@@ -27,10 +27,10 @@
import android.tools.common.datatypes.Rect
import android.tools.common.datatypes.RectF
import android.tools.common.datatypes.Region
-import android.tools.common.datatypes.component.ComponentNameMatcher
-import android.tools.common.datatypes.component.IComponentName
import android.tools.common.flicker.subject.wm.WindowManagerStateSubject
import android.tools.common.traces.DeviceStateDump
+import android.tools.common.traces.component.ComponentNameMatcher
+import android.tools.common.traces.component.IComponentName
import android.tools.common.traces.surfaceflinger.HwcCompositionType
import android.tools.common.traces.surfaceflinger.Layer
import android.tools.common.traces.surfaceflinger.LayerTraceEntryBuilder
