Revert "Refactors sample module directory structure"
This reverts commit 80c5948cb196176acfa835cde7b6b5c34a1d7580.
Reason for revert: Landed alongside aosp/1252731 and broke the build.
Change-Id: I6b3c19027ae64c7b9f798058f195c2c46b115b99
diff --git a/ui/settings.gradle b/ui/settings.gradle
index fc7f4a4..256d7d4 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:samples", "../compose/compose-runtime/samples")
+includeProject(":compose:compose-runtime:integration-tests:samples", "../compose/compose-runtime/integration-tests/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:samples", "ui-animation-core/samples")
+includeProject(":ui:ui-animation-core:integration-tests:samples", "ui-animation-core/integration-tests/samples")
includeProject(":ui:ui-animation:integration-tests:ui-animation-demos", "ui-animation/integration-tests/animation-demos")
-includeProject(":ui:ui-animation:samples", "ui-animation/samples")
+includeProject(":ui:ui-animation:integration-tests:samples", "ui-animation/integration-tests/samples")
includeProject(":ui:ui-core", "ui-core")
-includeProject(":ui:ui-core:samples", "ui-core/samples")
+includeProject(":ui:ui-core:integration-tests:samples", "ui-core/integration-tests/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:samples", "ui-framework/samples")
+includeProject(":ui:ui-framework:integration-tests:samples", "ui-framework/integration-tests/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: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-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-platform", "ui-platform")
-includeProject(":ui:ui-platform:samples", "ui-platform/samples")
+includeProject(":ui:ui-platform:integration-tests:samples", "ui-platform/integration-tests/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:samples", "ui-text/samples")
+includeProject(":ui:ui-text:integration-tests:ui-text-samples", "ui-text/integration-tests/samples")
includeProject(":ui:ui-tooling", "ui-tooling")
includeProject(":ui:ui-unit", "ui-unit")
-includeProject(":ui:ui-unit:samples", "ui-unit/samples")
+includeProject(":ui:ui-unit:integration-tests:samples", "ui-unit/integration-tests/samples")
includeProject(":ui:ui-util", "ui-util")
includeProject(":ui:ui-vector", "ui-vector")
