Revert "Revert "Refactors sample module directory structure""
This reverts commit 39594d79d236d67991df7bf63da57dec8fe58a2b.
Reason for revert: Landed after aosp/1253634 which fixed the build that was broken by this revert, so now it is broken again :)
Change-Id: I3d5e236b46504187f046d6045b56f9d08f81a911
diff --git a/annotation/annotation-sampled/src/main/java/androidx/annotation/Sampled.kt b/annotation/annotation-sampled/src/main/java/androidx/annotation/Sampled.kt
index 8b15edfc..96695fc 100644
--- a/annotation/annotation-sampled/src/main/java/androidx/annotation/Sampled.kt
+++ b/annotation/annotation-sampled/src/main/java/androidx/annotation/Sampled.kt
@@ -23,13 +23,13 @@
* 1. The source module is an ancestor of the sample module, for example:
* ```
* library/src/.. // Source file here that links to a sample
- * library/integration-tests/samples/src/.. // Sample file here that is linked to by the source file
+ * library/samples/src/.. // Sample file here that is linked to by the source file
* ```
*
* 2. The source module is a sibling to the sample module, for example:
* ```
* library/library-subfeature/src/.. // Source file here that links to a sample
- * library/integration-tests/samples/src/.. // Sample file here that is linked to by the source file
+ * library/samples/src/.. // Sample file here that is linked to by the source file
* ```
*
* There are corresponding lint checks ensuring that functions referred to from KDoc with a @sample
diff --git a/compose/compose-runtime/integration-tests/samples/build.gradle b/compose/compose-runtime/samples/build.gradle
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/build.gradle
rename to compose/compose-runtime/samples/build.gradle
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/AndroidManifest.xml b/compose/compose-runtime/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/AndroidManifest.xml
rename to compose/compose-runtime/samples/src/main/AndroidManifest.xml
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/AmbientSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/AmbientSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/AmbientSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/AmbientSamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/EffectSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/EffectSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/EffectSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/EffectSamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/KeySamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/KeySamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/KeySamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/KeySamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/ModelSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/PivotalSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/PivotalSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/PivotalSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/PivotalSamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/RecomposeSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/RecomposeSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/RecomposeSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/RecomposeSamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/SharedSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SharedSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/SharedSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SharedSamples.kt
diff --git a/compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt
similarity index 100%
rename from compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt
rename to compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt
diff --git a/lint-checks/src/main/java/androidx/build/lint/SampledAnnotationEnforcer.kt b/lint-checks/src/main/java/androidx/build/lint/SampledAnnotationEnforcer.kt
index 2d528aa..cff2336 100644
--- a/lint-checks/src/main/java/androidx/build/lint/SampledAnnotationEnforcer.kt
+++ b/lint-checks/src/main/java/androidx/build/lint/SampledAnnotationEnforcer.kt
@@ -16,7 +16,6 @@
package androidx.build.lint
-import androidx.build.lint.SampledAnnotationEnforcer.Companion.INTEGRATION_TESTS_DIRECTORY
import androidx.build.lint.SampledAnnotationEnforcer.Companion.SAMPLED_ANNOTATION
import androidx.build.lint.SampledAnnotationEnforcer.Companion.SAMPLES_DIRECTORY
import androidx.build.lint.SampledAnnotationEnforcer.Companion.SAMPLE_KDOC_ANNOTATION
@@ -79,8 +78,6 @@
const val SAMPLE_KDOC_ANNOTATION = "sample"
// The name of the @Sampled annotation that samples must be annotated with
const val SAMPLED_ANNOTATION = "Sampled"
- // The name of the integration-tests directory inside a project
- const val INTEGRATION_TESTS_DIRECTORY = "integration-tests"
// The name of the samples directory inside a project
const val SAMPLES_DIRECTORY = "samples"
@@ -374,7 +371,7 @@
* At this point we are inside some sample module, which is depending on a module that
* would end up referencing the sample
*
- * For example, we could be in :foo:integration-tests:sample, and we want to find the
+ * For example, we could be in :foo:sample, and we want to find the
* path for module :foo
*/
private fun buildSampleLinkCache(context: JavaContext): List<String> {
@@ -385,7 +382,7 @@
it.dir.absolutePath
}
- // Try and find a common path, i.e if we are in a/b/foo/integration-tests/sample, we
+ // Try and find a common path, i.e if we are in a/b/foo/sample, we
// will match a/b/foo for the parent. Find all such matching paths in case there are
// multiple modules sampling this one module.
var parentProjectPaths = dependenciesPathList
@@ -395,7 +392,7 @@
.ifEmpty { null }
// If we haven't found a path, it might be that we are on the same top level, i.e
- // we are in a/b/foo/integration-tests/sample, and the module is in a/b/foo/foo-xyz
+ // we are in a/b/foo/sample, and the module is in a/b/foo/foo-xyz
// Try matching with the parent directory of each module.
parentProjectPaths = parentProjectPaths ?: dependenciesPathList
.filter {
@@ -491,8 +488,8 @@
* sibling directory
*
* For example, if we are in a/b/foo, the samples directory could either be:
- * a/b/foo/integration-tests/samples
- * a/b/integration-tests/samples
+ * a/b/foo/samples
+ * a/b/samples
*
* For efficiency, first we look inside a/b/foo, and then if that fails we look
* inside a/b
@@ -502,14 +499,13 @@
val currentProjectDir = navigateToDirectory(context, currentProjectPath)
fun PsiDirectory.searchForSampleDirectory(): PsiDirectory? {
- return subdirectories.find { it.name == INTEGRATION_TESTS_DIRECTORY }
- ?.subdirectories?.find { it.name == SAMPLES_DIRECTORY }
+ return subdirectories.find { it.name == SAMPLES_DIRECTORY }
}
- // Look inside a/b/foo/integration-tests
+ // Look inside a/b/foo
var sampleDir = currentProjectDir.searchForSampleDirectory()
- // Try looking inside /a/b/integration-tests
+ // Try looking inside /a/b
if (sampleDir == null) {
sampleDir = currentProjectDir.parent!!.searchForSampleDirectory()
}
diff --git a/lint-checks/tests/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt b/lint-checks/tests/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt
index 482705a..38d1523 100644
--- a/lint-checks/tests/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt
+++ b/lint-checks/tests/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt
@@ -31,15 +31,14 @@
* This tests the following module setup:
*
* Module 'foo', which lives in foo
- * Module 'integration-tests:samples', which lives in integration-tests,
- * and depends on 'foo'
+ * Module 'samples', which lives in samples, and depends on 'foo'
*
* Unfortunately since we cannot test submodules, we cannot verify the case for
- * foo:integration-tests:samples in this test.
+ * foo:samples in this test.
*/
class SampledAnnotationEnforcerTest {
private val fooModuleName = "foo"
- private val sampleModuleName = "integration-tests"
+ private val sampleModuleName = "samples"
private val barFilePath = "foo/src/foo/Bar.kt"
@@ -72,22 +71,22 @@
fooFile: TestFile? = null,
sampleFile: TestFile? = null
): TestLintResult {
+ val projectDescriptions = mutableListOf<ProjectDescription>()
val fooProject = ProjectDescription().apply {
name = fooModuleName
fooFile?.let { files = arrayOf(fooFile) }
}
- val sampleProject = ProjectDescription().apply {
- name = sampleModuleName
- sampleFile?.let {
- // Hack to make it seem that we are in a samples sub-module of integration-tests,
- // since we cannot actually set this up in tests.
- sampleFile.within("samples/src")
+ projectDescriptions += fooProject
+
+ sampleFile?.let {
+ projectDescriptions += ProjectDescription().apply {
+ name = sampleModuleName
files = arrayOf(sampleFile)
+ dependsOn(fooProject)
}
- dependsOn(fooProject)
}
return lint()
- .projects(fooProject, sampleProject)
+ .projects(*projectDescriptions.toTypedArray())
.allowMissingSdk(true)
.issues(
SampledAnnotationEnforcer.MISSING_SAMPLED_ANNOTATION,
@@ -114,7 +113,7 @@
""")
val expected =
- "$barFilePath:6: Error: Couldn't find a valid samples directory in this project" +
+ "src/foo/Bar.kt:6: Error: Couldn't find a valid samples directory in this project" +
""" [EnforceSampledAnnotation]
* @sample foo.samples.sampleBar
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -168,7 +167,7 @@
val sampleFile = unannotatedSampleFile
val expected =
-"foo/src/foo/Bar.kt:6: Error: sampleBar is not annotated with @Sampled, but is linked to from" +
+"$barFilePath:6: Error: sampleBar is not annotated with @Sampled, but is linked to from" +
""" the KDoc of bar [EnforceSampledAnnotation]
* @sample foo.samples.sampleBar
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -233,11 +232,11 @@
/**
* @sample foo.samples.sampleBar
*/
- class Bar {}
+ class Bar
""")
val expected =
-"$barFilePath:5: Error: Couldn't find a valid samples directory in this project" +
+"src/foo/Bar.kt:5: Error: Couldn't find a valid samples directory in this project" +
""" [EnforceSampledAnnotation]
* @sample foo.samples.sampleBar
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -256,7 +255,7 @@
/**
* @sample foo.samples.sampleBar
*/
- class Bar {}
+ class Bar
""")
val sampleFile = emptySampleFile
@@ -281,7 +280,7 @@
/**
* @sample foo.samples.sampleBar
*/
- class Bar {}
+ class Bar
""")
val sampleFile = unannotatedSampleFile
@@ -306,7 +305,7 @@
/**
* @sample foo.samples.sampleBar
*/
- class Bar {}
+ class Bar
""")
val sampleFile = multipleMatchingSampleFile
@@ -331,7 +330,7 @@
/**
* @sample foo.samples.sampleBar
*/
- class Bar {}
+ class Bar
""")
val sampleFile = correctlyAnnotatedSampleFile
@@ -354,7 +353,7 @@
""")
val expected =
-"$barFilePath:6: Error: Couldn't find a valid samples directory in this project" +
+"src/foo/Bar.kt:6: Error: Couldn't find a valid samples directory in this project" +
""" [EnforceSampledAnnotation]
* @sample foo.samples.sampleBar
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/paging/integration-tests/samples/build.gradle b/paging/samples/build.gradle
similarity index 100%
rename from paging/integration-tests/samples/build.gradle
rename to paging/samples/build.gradle
diff --git a/paging/integration-tests/samples/src/main/AndroidManifest.xml b/paging/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from paging/integration-tests/samples/src/main/AndroidManifest.xml
rename to paging/samples/src/main/AndroidManifest.xml
diff --git a/paging/integration-tests/samples/src/main/java/androidx/paging/samples/BasePagingAdapter.kt b/paging/samples/src/main/java/androidx/paging/samples/BasePagingAdapter.kt
similarity index 100%
rename from paging/integration-tests/samples/src/main/java/androidx/paging/samples/BasePagingAdapter.kt
rename to paging/samples/src/main/java/androidx/paging/samples/BasePagingAdapter.kt
diff --git a/paging/integration-tests/samples/src/main/java/androidx/paging/samples/BaseViewModel.kt b/paging/samples/src/main/java/androidx/paging/samples/BaseViewModel.kt
similarity index 100%
rename from paging/integration-tests/samples/src/main/java/androidx/paging/samples/BaseViewModel.kt
rename to paging/samples/src/main/java/androidx/paging/samples/BaseViewModel.kt
diff --git a/paging/integration-tests/samples/src/main/java/androidx/paging/samples/CachedInSample.kt b/paging/samples/src/main/java/androidx/paging/samples/CachedInSample.kt
similarity index 100%
rename from paging/integration-tests/samples/src/main/java/androidx/paging/samples/CachedInSample.kt
rename to paging/samples/src/main/java/androidx/paging/samples/CachedInSample.kt
diff --git a/paging/integration-tests/samples/src/main/java/androidx/paging/samples/PagingDataAdapterSample.kt b/paging/samples/src/main/java/androidx/paging/samples/PagingDataAdapterSample.kt
similarity index 100%
rename from paging/integration-tests/samples/src/main/java/androidx/paging/samples/PagingDataAdapterSample.kt
rename to paging/samples/src/main/java/androidx/paging/samples/PagingDataAdapterSample.kt
diff --git a/paging/integration-tests/samples/src/main/java/androidx/paging/samples/PagingDataSample.kt b/paging/samples/src/main/java/androidx/paging/samples/PagingDataSample.kt
similarity index 100%
rename from paging/integration-tests/samples/src/main/java/androidx/paging/samples/PagingDataSample.kt
rename to paging/samples/src/main/java/androidx/paging/samples/PagingDataSample.kt
diff --git a/settings.gradle b/settings.gradle
index 8214feb..efea50b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -200,7 +200,6 @@
includeProject(":navigation:navigation-integration-tests:testapp", "navigation/integration-tests/testapp")
includeProject(":navigation:navigation-safe-args-generator", "navigation/navigation-safe-args-generator")
includeProject(":navigation:navigation-safe-args-gradle-plugin", "navigation/navigation-safe-args-gradle-plugin")
-includeProject(":paging:integration-tests:samples", "paging/integration-tests/samples")
includeProject(":paging:integration-tests:testapp", "paging/integration-tests/testapp")
includeProject(":paging:paging-common", "paging/common")
includeProject(":paging:paging-common-ktx", "paging/common/ktx")
@@ -210,6 +209,7 @@
includeProject(":paging:paging-rxjava2-ktx", "paging/rxjava2/ktx")
includeProject(":paging:paging-guava", "paging/guava")
includeProject(":paging:paging-testutils", "paging/testutils")
+includeProject(":paging:samples", "paging/samples")
includeProject(":palette:palette", "palette/palette")
includeProject(":palette:palette-ktx", "palette/palette-ktx")
includeProject(":percentlayout:percentlayout", "percentlayout/percentlayout")
diff --git a/ui/settings.gradle b/ui/settings.gradle
index 256d7d4..fc7f4a4 100644
--- a/ui/settings.gradle
+++ b/ui/settings.gradle
@@ -41,51 +41,51 @@
includeProject(":compose:compose-compiler-hosted:integration-tests", "../compose/compose-compiler-hosted/integration-tests")
includeProject(":compose:compose-runtime", "../compose/compose-runtime")
includeProject(":compose:compose-runtime-benchmark", "../compose/compose-runtime/compose-runtime-benchmark")
-includeProject(":compose:compose-runtime:integration-tests:samples", "../compose/compose-runtime/integration-tests/samples")
+includeProject(":compose:compose-runtime:samples", "../compose/compose-runtime/samples")
includeProject(":lint-checks", "../lint-checks")
includeProject(":ui:integration-tests:benchmark", "integration-tests/benchmark")
includeProject(":ui:integration-tests:demos", "integration-tests/demos")
includeProject(":ui:integration-tests:test", "integration-tests/test")
includeProject(":ui:ui-android-text", "ui-android-text")
includeProject(":ui:ui-android-view", "ui-android-view")
-includeProject(":ui:ui-android-view:integration-tests:samples", "ui-android-view/integration-tests/samples")
includeProject(":ui:ui-android-view:integration-tests:ui-android-view-demos", "ui-android-view/integration-tests/android-view-demos")
+includeProject(":ui:ui-android-view:samples", "ui-android-view/samples")
includeProject(":ui:ui-animation", "ui-animation")
includeProject(":ui:ui-animation-core", "ui-animation-core")
-includeProject(":ui:ui-animation-core:integration-tests:samples", "ui-animation-core/integration-tests/samples")
+includeProject(":ui:ui-animation-core:samples", "ui-animation-core/samples")
includeProject(":ui:ui-animation:integration-tests:ui-animation-demos", "ui-animation/integration-tests/animation-demos")
-includeProject(":ui:ui-animation:integration-tests:samples", "ui-animation/integration-tests/samples")
+includeProject(":ui:ui-animation:samples", "ui-animation/samples")
includeProject(":ui:ui-core", "ui-core")
-includeProject(":ui:ui-core:integration-tests:samples", "ui-core/integration-tests/samples")
+includeProject(":ui:ui-core:samples", "ui-core/samples")
includeProject(":ui:ui-foundation", "ui-foundation")
-includeProject(":ui:ui-foundation:integration-tests:samples", "ui-foundation/integration-tests/samples")
includeProject(":ui:ui-foundation:integration-tests:ui-foundation-demos", "ui-foundation/integration-tests/foundation-demos")
+includeProject(":ui:ui-foundation:samples", "ui-foundation/samples")
includeProject(":ui:ui-framework", "ui-framework")
includeProject(":ui:ui-framework:integration-tests:ui-framework-demos", "ui-framework/integration-tests/framework-demos")
-includeProject(":ui:ui-framework:integration-tests:samples", "ui-framework/integration-tests/samples")
+includeProject(":ui:ui-framework:samples", "ui-framework/samples")
includeProject(":ui:ui-internal-lint-checks", "ui-internal-lint-checks")
includeProject(":ui:ui-geometry", "ui-geometry")
includeProject(":ui:ui-graphics", "ui-graphics")
includeProject(":ui:ui-layout", "ui-layout")
-includeProject(":ui:ui-layout:integration-tests:samples", "ui-layout/integration-tests/samples")
includeProject(":ui:ui-layout:integration-tests:ui-layout-demos", "ui-layout/integration-tests/layout-demos")
+includeProject(":ui:ui-layout:samples", "ui-layout/samples")
includeProject(":ui:ui-material", "ui-material")
-includeProject(":ui:ui-material-icons-core", "ui-material/icons/core")
-includeProject(":ui:ui-material-icons-extended", "ui-material/icons/extended")
-includeProject(":ui:ui-material:icons:generator", "ui-material/icons/generator")
-includeProject(":ui:ui-material-icons-core:integration-tests:samples", "ui-material/icons/core/integration-tests/samples")
-includeProject(":ui:ui-material:integration-tests:samples", "ui-material/integration-tests/samples")
includeProject(":ui:ui-material:integration-tests:ui-material-demos", "ui-material/integration-tests/material-demos")
includeProject(":ui:ui-material:integration-tests:ui-material-studies", "ui-material/integration-tests/material-studies")
+includeProject(":ui:ui-material:samples", "ui-material/samples")
+includeProject(":ui:ui-material-icons-core", "ui-material/icons/core")
+includeProject(":ui:ui-material-icons-core:samples", "ui-material/icons/core/samples")
+includeProject(":ui:ui-material-icons-extended", "ui-material/icons/extended")
+includeProject(":ui:ui-material:icons:generator", "ui-material/icons/generator")
includeProject(":ui:ui-platform", "ui-platform")
-includeProject(":ui:ui-platform:integration-tests:samples", "ui-platform/integration-tests/samples")
+includeProject(":ui:ui-platform:samples", "ui-platform/samples")
includeProject(":ui:ui-test", "ui-test")
includeProject(":ui:ui-text", "ui-text")
includeProject(":ui:ui-text:integration-tests:ui-text-demos", "ui-text/integration-tests/text-demos")
-includeProject(":ui:ui-text:integration-tests:ui-text-samples", "ui-text/integration-tests/samples")
+includeProject(":ui:ui-text:samples", "ui-text/samples")
includeProject(":ui:ui-tooling", "ui-tooling")
includeProject(":ui:ui-unit", "ui-unit")
-includeProject(":ui:ui-unit:integration-tests:samples", "ui-unit/integration-tests/samples")
+includeProject(":ui:ui-unit:samples", "ui-unit/samples")
includeProject(":ui:ui-util", "ui-util")
includeProject(":ui:ui-vector", "ui-vector")
diff --git a/ui/ui-android-view/integration-tests/samples/build.gradle b/ui/ui-android-view/samples/build.gradle
similarity index 100%
rename from ui/ui-android-view/integration-tests/samples/build.gradle
rename to ui/ui-android-view/samples/build.gradle
diff --git a/ui/ui-android-view/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-android-view/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-android-view/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-android-view/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-animation-core/integration-tests/samples/build.gradle b/ui/ui-animation-core/samples/build.gradle
similarity index 100%
rename from ui/ui-animation-core/integration-tests/samples/build.gradle
rename to ui/ui-animation-core/samples/build.gradle
diff --git a/ui/ui-animation-core/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-animation-core/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-animation-core/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-animation-core/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-animation-core/integration-tests/samples/src/main/java/androidx/animation/samples/KeyframesBuilderSample.kt b/ui/ui-animation-core/samples/src/main/java/androidx/animation/samples/KeyframesBuilderSample.kt
similarity index 100%
rename from ui/ui-animation-core/integration-tests/samples/src/main/java/androidx/animation/samples/KeyframesBuilderSample.kt
rename to ui/ui-animation-core/samples/src/main/java/androidx/animation/samples/KeyframesBuilderSample.kt
diff --git a/ui/ui-animation-core/integration-tests/samples/src/main/java/androidx/animation/samples/TransitionDefinitionSamples.kt b/ui/ui-animation-core/samples/src/main/java/androidx/animation/samples/TransitionDefinitionSamples.kt
similarity index 100%
rename from ui/ui-animation-core/integration-tests/samples/src/main/java/androidx/animation/samples/TransitionDefinitionSamples.kt
rename to ui/ui-animation-core/samples/src/main/java/androidx/animation/samples/TransitionDefinitionSamples.kt
diff --git a/ui/ui-animation-core/integration-tests/samples/src/main/java/androidx/animation/samples/TransitionSpecSamples.kt b/ui/ui-animation-core/samples/src/main/java/androidx/animation/samples/TransitionSpecSamples.kt
similarity index 100%
rename from ui/ui-animation-core/integration-tests/samples/src/main/java/androidx/animation/samples/TransitionSpecSamples.kt
rename to ui/ui-animation-core/samples/src/main/java/androidx/animation/samples/TransitionSpecSamples.kt
diff --git a/ui/ui-animation/integration-tests/samples/build.gradle b/ui/ui-animation/samples/build.gradle
similarity index 100%
rename from ui/ui-animation/integration-tests/samples/build.gradle
rename to ui/ui-animation/samples/build.gradle
diff --git a/ui/ui-animation/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-animation/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-animation/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-animation/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-animation/integration-tests/samples/src/main/java/androidx/ui/animation/samples/AnimatedValueSamples.kt b/ui/ui-animation/samples/src/main/java/androidx/ui/animation/samples/AnimatedValueSamples.kt
similarity index 100%
rename from ui/ui-animation/integration-tests/samples/src/main/java/androidx/ui/animation/samples/AnimatedValueSamples.kt
rename to ui/ui-animation/samples/src/main/java/androidx/ui/animation/samples/AnimatedValueSamples.kt
diff --git a/ui/ui-animation/integration-tests/samples/src/main/java/androidx/ui/animation/samples/CrossfadeSample.kt b/ui/ui-animation/samples/src/main/java/androidx/ui/animation/samples/CrossfadeSample.kt
similarity index 100%
rename from ui/ui-animation/integration-tests/samples/src/main/java/androidx/ui/animation/samples/CrossfadeSample.kt
rename to ui/ui-animation/samples/src/main/java/androidx/ui/animation/samples/CrossfadeSample.kt
diff --git a/ui/ui-animation/integration-tests/samples/src/main/java/androidx/ui/animation/samples/TransitionSamples.kt b/ui/ui-animation/samples/src/main/java/androidx/ui/animation/samples/TransitionSamples.kt
similarity index 100%
rename from ui/ui-animation/integration-tests/samples/src/main/java/androidx/ui/animation/samples/TransitionSamples.kt
rename to ui/ui-animation/samples/src/main/java/androidx/ui/animation/samples/TransitionSamples.kt
diff --git a/ui/ui-core/integration-tests/samples/build.gradle b/ui/ui-core/samples/build.gradle
similarity index 100%
rename from ui/ui-core/integration-tests/samples/build.gradle
rename to ui/ui-core/samples/build.gradle
diff --git a/ui/ui-core/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-core/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-core/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-core/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/AlignmentLineSample.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/AlignmentLineSample.kt
similarity index 100%
rename from ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/AlignmentLineSample.kt
rename to ui/ui-core/samples/src/main/java/androidx/ui/core/samples/AlignmentLineSample.kt
diff --git a/ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/LayerModifierSamples.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/LayerModifierSamples.kt
similarity index 100%
rename from ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/LayerModifierSamples.kt
rename to ui/ui-core/samples/src/main/java/androidx/ui/core/samples/LayerModifierSamples.kt
diff --git a/ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/ModifierSamples.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/ModifierSamples.kt
similarity index 100%
rename from ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/ModifierSamples.kt
rename to ui/ui-core/samples/src/main/java/androidx/ui/core/samples/ModifierSamples.kt
diff --git a/ui/ui-foundation/integration-tests/foundation-demos/build.gradle b/ui/ui-foundation/integration-tests/foundation-demos/build.gradle
index f1a5ef4..68ecbda 100644
--- a/ui/ui-foundation/integration-tests/foundation-demos/build.gradle
+++ b/ui/ui-foundation/integration-tests/foundation-demos/build.gradle
@@ -43,7 +43,7 @@
implementation project(":ui:ui-framework")
implementation project(":ui:ui-animation")
implementation project(":ui:ui-layout")
- implementation project(":ui:ui-foundation:integration-tests:samples")
+ implementation project(":ui:ui-foundation:samples")
implementation project(":ui:ui-text")
implementation project(':ui:ui-android-view')
}
diff --git a/ui/ui-foundation/integration-tests/samples/build.gradle b/ui/ui-foundation/samples/build.gradle
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/build.gradle
rename to ui/ui-foundation/samples/build.gradle
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-foundation/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-foundation/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/BorderSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/BorderSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/BorderSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/BorderSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/BoxSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/BoxSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/BoxSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/BoxSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/CanvasSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/CanvasSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/CanvasSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/CanvasSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ClickableSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ClickableSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ClickableSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ClickableSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ColoredRectSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ColoredRectSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ColoredRectSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ColoredRectSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DarkThemeSample.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DarkThemeSample.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DarkThemeSample.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DarkThemeSample.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DeterminateProgressSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DeterminateProgressSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DeterminateProgressSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DeterminateProgressSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DialogSample.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DialogSample.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DialogSample.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DialogSample.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DraggableSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DraggableSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DraggableSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DraggableSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ImageSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ImageSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ImageSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ImageSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollableSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollableSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollableSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollableSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ToggleableSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ToggleableSamples.kt
similarity index 100%
rename from ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ToggleableSamples.kt
rename to ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ToggleableSamples.kt
diff --git a/ui/ui-framework/integration-tests/samples/build.gradle b/ui/ui-framework/samples/build.gradle
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/build.gradle
rename to ui/ui-framework/samples/build.gradle
diff --git a/ui/ui-framework/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-framework/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-framework/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/LayoutSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/LayoutSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/LayoutSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/LayoutSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/OnPositionedSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/OnPositionedSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/OnPositionedSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/OnPositionedSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/OpacitySample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/OpacitySample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/OpacitySample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/OpacitySample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/PainterSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/PainterSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/PainterSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/PainterSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/ParentDataSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/ParentDataSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/ParentDataSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/ParentDataSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/PopupSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/PopupSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/PopupSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/PopupSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/TextFieldSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/TextFieldSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/TextFieldSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/TextFieldSample.kt
diff --git a/ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/WithConstraintsSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/WithConstraintsSample.kt
similarity index 100%
rename from ui/ui-framework/integration-tests/samples/src/main/java/androidx/ui/framework/samples/WithConstraintsSample.kt
rename to ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/WithConstraintsSample.kt
diff --git a/ui/ui-layout/integration-tests/layout-demos/build.gradle b/ui/ui-layout/integration-tests/layout-demos/build.gradle
index ec70e05..5365827 100644
--- a/ui/ui-layout/integration-tests/layout-demos/build.gradle
+++ b/ui/ui-layout/integration-tests/layout-demos/build.gradle
@@ -39,7 +39,7 @@
implementation project(":ui:ui-core")
implementation project(":ui:ui-framework")
implementation project(":ui:ui-layout")
- implementation project(":ui:ui-layout:integration-tests:samples")
+ implementation project(":ui:ui-layout:samples")
implementation project(":ui:ui-text")
implementation project(":ui:ui-foundation")
}
diff --git a/ui/ui-layout/integration-tests/samples/build.gradle b/ui/ui-layout/samples/build.gradle
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/build.gradle
rename to ui/ui-layout/samples/build.gradle
diff --git a/ui/ui-layout/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-layout/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-layout/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutOffsetSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/LayoutOffsetSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutOffsetSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/LayoutOffsetSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt b/ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
similarity index 100%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
rename to ui/ui-layout/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
diff --git a/ui/ui-material/build.gradle b/ui/ui-material/build.gradle
index 32d9d7c..e7f3e4a 100644
--- a/ui/ui-material/build.gradle
+++ b/ui/ui-material/build.gradle
@@ -57,7 +57,7 @@
exclude group: 'org.mockito' // to keep control on the mockito version
}
- androidTestImplementation project(":ui:ui-material:integration-tests:samples")
+ androidTestImplementation project(":ui:ui-material:samples")
androidTestImplementation project(":ui:ui-platform")
androidTestImplementation project(":ui:ui-test")
diff --git a/ui/ui-material/icons/core/integration-tests/samples/build.gradle b/ui/ui-material/icons/core/samples/build.gradle
similarity index 100%
rename from ui/ui-material/icons/core/integration-tests/samples/build.gradle
rename to ui/ui-material/icons/core/samples/build.gradle
diff --git a/ui/ui-material/icons/core/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-material/icons/core/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-material/icons/core/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-material/icons/core/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-material/icons/core/integration-tests/samples/src/main/java/androidx/ui/material/icons/samples/IconSamples.kt b/ui/ui-material/icons/core/samples/src/main/java/androidx/ui/material/icons/samples/IconSamples.kt
similarity index 100%
rename from ui/ui-material/icons/core/integration-tests/samples/src/main/java/androidx/ui/material/icons/samples/IconSamples.kt
rename to ui/ui-material/icons/core/samples/src/main/java/androidx/ui/material/icons/samples/IconSamples.kt
diff --git a/ui/ui-material/integration-tests/material-demos/build.gradle b/ui/ui-material/integration-tests/material-demos/build.gradle
index da84289..3ef0dad 100644
--- a/ui/ui-material/integration-tests/material-demos/build.gradle
+++ b/ui/ui-material/integration-tests/material-demos/build.gradle
@@ -28,7 +28,7 @@
implementation project(":ui:ui-foundation")
implementation project(":ui:ui-framework")
implementation project(":ui:ui-layout")
- implementation project(":ui:ui-material:integration-tests:samples")
+ implementation project(":ui:ui-material:samples")
implementation project(":ui:ui-text")
implementation project(':ui:ui-android-view')
implementation project(':ui:ui-material')
diff --git a/ui/ui-material/integration-tests/samples/build.gradle b/ui/ui-material/samples/build.gradle
similarity index 100%
rename from ui/ui-material/integration-tests/samples/build.gradle
rename to ui/ui-material/samples/build.gradle
diff --git a/ui/ui-material/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-material/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-material/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/AlertDialogSample.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/AlertDialogSample.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/AlertDialogSample.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/AlertDialogSample.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/AppBarSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/AppBarSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/AppBarSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/AppBarSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/BottomNavigationSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/BottomNavigationSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/BottomNavigationSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/BottomNavigationSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ButtonSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ButtonSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ButtonSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ButtonSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/CardSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/CardSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/CardSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/CardSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DataTableSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/DataTableSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DataTableSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/DataTableSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/EmphasisSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/EmphasisSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/EmphasisSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/EmphasisSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/FloatingActionButtonSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/FloatingActionButtonSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/FloatingActionButtonSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/FloatingActionButtonSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/IconButtonSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/IconButtonSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/IconButtonSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/IconButtonSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ListSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ListSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ListSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ListSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/RippleSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/RippleSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/RippleSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/RippleSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SelectionControlsSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/SelectionControlsSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SelectionControlsSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/SelectionControlsSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SliderSample.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/SliderSample.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SliderSample.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/SliderSample.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SnackbarSample.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/SnackbarSample.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SnackbarSample.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/SnackbarSample.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt
diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt
similarity index 100%
rename from ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt
rename to ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt
diff --git a/ui/ui-platform/build.gradle b/ui/ui-platform/build.gradle
index 2f4cafa..31c4dc5 100644
--- a/ui/ui-platform/build.gradle
+++ b/ui/ui-platform/build.gradle
@@ -63,7 +63,7 @@
}
androidTestImplementation project(":ui:ui-test")
- androidTestImplementation project(":ui:ui-platform:integration-tests:samples")
+ androidTestImplementation project(":ui:ui-platform:samples")
}
androidx {
diff --git a/ui/ui-platform/integration-tests/samples/build.gradle b/ui/ui-platform/samples/build.gradle
similarity index 100%
rename from ui/ui-platform/integration-tests/samples/build.gradle
rename to ui/ui-platform/samples/build.gradle
diff --git a/ui/ui-platform/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-platform/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-platform/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-platform/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-platform/integration-tests/samples/src/main/java/androidx/ui/core/samples/ModelObserverUsage.kt b/ui/ui-platform/samples/src/main/java/androidx/ui/core/samples/ModelObserverUsage.kt
similarity index 100%
rename from ui/ui-platform/integration-tests/samples/src/main/java/androidx/ui/core/samples/ModelObserverUsage.kt
rename to ui/ui-platform/samples/src/main/java/androidx/ui/core/samples/ModelObserverUsage.kt
diff --git a/ui/ui-text/integration-tests/text-demos/build.gradle b/ui/ui-text/integration-tests/text-demos/build.gradle
index 6582b43..850e433 100644
--- a/ui/ui-text/integration-tests/text-demos/build.gradle
+++ b/ui/ui-text/integration-tests/text-demos/build.gradle
@@ -23,7 +23,7 @@
implementation project(':ui:ui-foundation')
implementation project(':ui:ui-layout')
implementation project(':ui:ui-text')
- implementation project(':ui:ui-text:integration-tests:ui-text-samples')
+ implementation project(':ui:ui-text:samples')
}
android {
diff --git a/ui/ui-text/integration-tests/samples/build.gradle b/ui/ui-text/samples/build.gradle
similarity index 100%
rename from ui/ui-text/integration-tests/samples/build.gradle
rename to ui/ui-text/samples/build.gradle
diff --git a/ui/ui-text/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-text/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-text/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt b/ui/ui-text/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt
rename to ui/ui-text/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt
diff --git a/ui/ui-text/integration-tests/samples/src/main/res/font/my_font_400_italic.ttf b/ui/ui-text/samples/src/main/res/font/my_font_400_italic.ttf
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/res/font/my_font_400_italic.ttf
rename to ui/ui-text/samples/src/main/res/font/my_font_400_italic.ttf
diff --git a/ui/ui-text/integration-tests/samples/src/main/res/font/my_font_400_regular.ttf b/ui/ui-text/samples/src/main/res/font/my_font_400_regular.ttf
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/res/font/my_font_400_regular.ttf
rename to ui/ui-text/samples/src/main/res/font/my_font_400_regular.ttf
diff --git a/ui/ui-text/integration-tests/samples/src/main/res/font/myfont.ttf b/ui/ui-text/samples/src/main/res/font/myfont.ttf
similarity index 100%
rename from ui/ui-text/integration-tests/samples/src/main/res/font/myfont.ttf
rename to ui/ui-text/samples/src/main/res/font/myfont.ttf
diff --git a/ui/ui-unit/integration-tests/samples/build.gradle b/ui/ui-unit/samples/build.gradle
similarity index 100%
rename from ui/ui-unit/integration-tests/samples/build.gradle
rename to ui/ui-unit/samples/build.gradle
diff --git a/ui/ui-unit/integration-tests/samples/src/main/AndroidManifest.xml b/ui/ui-unit/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/ui-unit/integration-tests/samples/src/main/AndroidManifest.xml
rename to ui/ui-unit/samples/src/main/AndroidManifest.xml
diff --git a/ui/ui-unit/integration-tests/samples/src/main/java/androidx/ui/unit/samples/DensitySample.kt b/ui/ui-unit/samples/src/main/java/androidx/ui/unit/samples/DensitySample.kt
similarity index 100%
rename from ui/ui-unit/integration-tests/samples/src/main/java/androidx/ui/unit/samples/DensitySample.kt
rename to ui/ui-unit/samples/src/main/java/androidx/ui/unit/samples/DensitySample.kt
