Move gridlayout to the new proper directory structure
Bug: 134082137
Test: ./gradlew assembleDebug
Change-Id: Ie52d80ed341fba57dc8e625d542cd547c897cc07
diff --git a/gridlayout/api/1.0.0.txt b/gridlayout/gridlayout/api/1.0.0.txt
similarity index 100%
rename from gridlayout/api/1.0.0.txt
rename to gridlayout/gridlayout/api/1.0.0.txt
diff --git a/gridlayout/api/1.1.0-alpha01.txt b/gridlayout/gridlayout/api/1.1.0-alpha01.txt
similarity index 100%
rename from gridlayout/api/1.1.0-alpha01.txt
rename to gridlayout/gridlayout/api/1.1.0-alpha01.txt
diff --git a/gridlayout/api/api_lint.ignore b/gridlayout/gridlayout/api/api_lint.ignore
similarity index 100%
rename from gridlayout/api/api_lint.ignore
rename to gridlayout/gridlayout/api/api_lint.ignore
diff --git a/gridlayout/api/current.txt b/gridlayout/gridlayout/api/current.txt
similarity index 100%
rename from gridlayout/api/current.txt
rename to gridlayout/gridlayout/api/current.txt
diff --git a/gridlayout/api/public_plus_experimental_1.0.0.txt b/gridlayout/gridlayout/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from gridlayout/api/public_plus_experimental_1.0.0.txt
rename to gridlayout/gridlayout/api/public_plus_experimental_1.0.0.txt
diff --git a/gridlayout/api/public_plus_experimental_1.1.0-alpha01.txt b/gridlayout/gridlayout/api/public_plus_experimental_1.1.0-alpha01.txt
similarity index 100%
rename from gridlayout/api/public_plus_experimental_1.1.0-alpha01.txt
rename to gridlayout/gridlayout/api/public_plus_experimental_1.1.0-alpha01.txt
diff --git a/gridlayout/api/public_plus_experimental_current.txt b/gridlayout/gridlayout/api/public_plus_experimental_current.txt
similarity index 100%
rename from gridlayout/api/public_plus_experimental_current.txt
rename to gridlayout/gridlayout/api/public_plus_experimental_current.txt
diff --git a/gridlayout/api/res-1.1.0-alpha01.txt b/gridlayout/gridlayout/api/res-1.1.0-alpha01.txt
similarity index 100%
rename from gridlayout/api/res-1.1.0-alpha01.txt
rename to gridlayout/gridlayout/api/res-1.1.0-alpha01.txt
diff --git a/gridlayout/api/restricted_1.0.0.txt b/gridlayout/gridlayout/api/restricted_1.0.0.txt
similarity index 100%
rename from gridlayout/api/restricted_1.0.0.txt
rename to gridlayout/gridlayout/api/restricted_1.0.0.txt
diff --git a/gridlayout/api/restricted_1.1.0-alpha01.txt b/gridlayout/gridlayout/api/restricted_1.1.0-alpha01.txt
similarity index 100%
rename from gridlayout/api/restricted_1.1.0-alpha01.txt
rename to gridlayout/gridlayout/api/restricted_1.1.0-alpha01.txt
diff --git a/gridlayout/api/restricted_current.txt b/gridlayout/gridlayout/api/restricted_current.txt
similarity index 100%
rename from gridlayout/api/restricted_current.txt
rename to gridlayout/gridlayout/api/restricted_current.txt
diff --git a/gridlayout/api_legacy/26.0.0.txt b/gridlayout/gridlayout/api_legacy/26.0.0.txt
similarity index 100%
rename from gridlayout/api_legacy/26.0.0.txt
rename to gridlayout/gridlayout/api_legacy/26.0.0.txt
diff --git a/gridlayout/api_legacy/26.1.0.txt b/gridlayout/gridlayout/api_legacy/26.1.0.txt
similarity index 100%
rename from gridlayout/api_legacy/26.1.0.txt
rename to gridlayout/gridlayout/api_legacy/26.1.0.txt
diff --git a/gridlayout/api_legacy/27.0.0.ignore b/gridlayout/gridlayout/api_legacy/27.0.0.ignore
similarity index 100%
rename from gridlayout/api_legacy/27.0.0.ignore
rename to gridlayout/gridlayout/api_legacy/27.0.0.ignore
diff --git a/gridlayout/api_legacy/27.0.0.txt b/gridlayout/gridlayout/api_legacy/27.0.0.txt
similarity index 100%
rename from gridlayout/api_legacy/27.0.0.txt
rename to gridlayout/gridlayout/api_legacy/27.0.0.txt
diff --git a/gridlayout/api_legacy/27.1.0.txt b/gridlayout/gridlayout/api_legacy/27.1.0.txt
similarity index 100%
rename from gridlayout/api_legacy/27.1.0.txt
rename to gridlayout/gridlayout/api_legacy/27.1.0.txt
diff --git a/gridlayout/api_legacy/28.0.0-alpha1.txt b/gridlayout/gridlayout/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from gridlayout/api_legacy/28.0.0-alpha1.txt
rename to gridlayout/gridlayout/api_legacy/28.0.0-alpha1.txt
diff --git a/gridlayout/api_legacy/current.txt b/gridlayout/gridlayout/api_legacy/current.txt
similarity index 100%
rename from gridlayout/api_legacy/current.txt
rename to gridlayout/gridlayout/api_legacy/current.txt
diff --git a/gridlayout/build.gradle b/gridlayout/gridlayout/build.gradle
similarity index 100%
rename from gridlayout/build.gradle
rename to gridlayout/gridlayout/build.gradle
diff --git a/gridlayout/lint-baseline.xml b/gridlayout/gridlayout/lint-baseline.xml
similarity index 100%
rename from gridlayout/lint-baseline.xml
rename to gridlayout/gridlayout/lint-baseline.xml
diff --git a/gridlayout/src/androidTest/AndroidManifest.xml b/gridlayout/gridlayout/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from gridlayout/src/androidTest/AndroidManifest.xml
rename to gridlayout/gridlayout/src/androidTest/AndroidManifest.xml
diff --git a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java b/gridlayout/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
similarity index 100%
rename from gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
rename to gridlayout/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
diff --git a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java b/gridlayout/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java
similarity index 100%
rename from gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java
rename to gridlayout/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTestActivity.java
diff --git a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/TestContentView.java b/gridlayout/gridlayout/src/androidTest/java/androidx/gridlayout/widget/TestContentView.java
similarity index 100%
rename from gridlayout/src/androidTest/java/androidx/gridlayout/widget/TestContentView.java
rename to gridlayout/gridlayout/src/androidTest/java/androidx/gridlayout/widget/TestContentView.java
diff --git a/gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml b/gridlayout/gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml
similarity index 100%
rename from gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml
rename to gridlayout/gridlayout/src/androidTest/res/layout/fill_horizontal_test.xml
diff --git a/gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml b/gridlayout/gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml
similarity index 100%
rename from gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml
rename to gridlayout/gridlayout/src/androidTest/res/layout/height_wrap_content_test.xml
diff --git a/gridlayout/src/androidTest/res/layout/make_view_gone_test.xml b/gridlayout/gridlayout/src/androidTest/res/layout/make_view_gone_test.xml
similarity index 100%
rename from gridlayout/src/androidTest/res/layout/make_view_gone_test.xml
rename to gridlayout/gridlayout/src/androidTest/res/layout/make_view_gone_test.xml
diff --git a/gridlayout/src/androidTest/res/layout/use_default_margin_test.xml b/gridlayout/gridlayout/src/androidTest/res/layout/use_default_margin_test.xml
similarity index 100%
rename from gridlayout/src/androidTest/res/layout/use_default_margin_test.xml
rename to gridlayout/gridlayout/src/androidTest/res/layout/use_default_margin_test.xml
diff --git a/gridlayout/src/androidTest/res/values/colors.xml b/gridlayout/gridlayout/src/androidTest/res/values/colors.xml
similarity index 100%
rename from gridlayout/src/androidTest/res/values/colors.xml
rename to gridlayout/gridlayout/src/androidTest/res/values/colors.xml
diff --git a/gridlayout/src/main/AndroidManifest.xml b/gridlayout/gridlayout/src/main/AndroidManifest.xml
similarity index 100%
rename from gridlayout/src/main/AndroidManifest.xml
rename to gridlayout/gridlayout/src/main/AndroidManifest.xml
diff --git a/gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java b/gridlayout/gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java
similarity index 100%
rename from gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java
rename to gridlayout/gridlayout/src/main/java/androidx/gridlayout/widget/GridLayout.java
diff --git a/gridlayout/src/main/res/values/attrs.xml b/gridlayout/gridlayout/src/main/res/values/attrs.xml
similarity index 100%
rename from gridlayout/src/main/res/values/attrs.xml
rename to gridlayout/gridlayout/src/main/res/values/attrs.xml
diff --git a/gridlayout/src/main/res/values/dimens.xml b/gridlayout/gridlayout/src/main/res/values/dimens.xml
similarity index 100%
rename from gridlayout/src/main/res/values/dimens.xml
rename to gridlayout/gridlayout/src/main/res/values/dimens.xml
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index a6736a3..6a139249 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle
@@ -11,7 +11,7 @@
implementation(project(":appcompat:appcompat"))
implementation(project(":cardview:cardview"))
implementation(project(":core:core"))
- implementation(project(":gridlayout"))
+ implementation(project(":gridlayout:gridlayout"))
implementation(project(":mediarouter"))
implementation(project(":palette:palette"))
implementation(project(":recyclerview:recyclerview"))
diff --git a/settings.gradle b/settings.gradle
index fca3f18..c21a482 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -126,7 +126,7 @@
includeProject(":fragment:fragment-testing-lint", "fragment/fragment-testing-lint")
includeProject(":fragment:fragment-truth", "fragment/fragment-truth")
includeProject(":fakeannotations", "fakeannotations")
-includeProject(":gridlayout", "gridlayout")
+includeProject(":gridlayout:gridlayout", "gridlayout/gridlayout")
includeProject(":heifwriter:heifwriter", "heifwriter/heifwriter")
includeProject(":inspection:inspection", "inspection/inspection")
includeProject(":inspection:inspection-gradle-plugin", "inspection/inspection-gradle-plugin")
