Move coordinatorlayout to the new proper directory structure
Bug: 134082137
Test: ./gradlew assembleDebug
Change-Id: I755822d1b8e6d813a3474b2e00bca1c6a6230c30
diff --git a/coordinatorlayout/api/1.1.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/1.1.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/1.1.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/1.1.0-alpha01.txt
diff --git a/coordinatorlayout/api/1.1.0-alpha02.txt b/coordinatorlayout/coordinatorlayout/api/1.1.0-alpha02.txt
similarity index 100%
rename from coordinatorlayout/api/1.1.0-alpha02.txt
rename to coordinatorlayout/coordinatorlayout/api/1.1.0-alpha02.txt
diff --git a/coordinatorlayout/api/1.1.0-beta01.txt b/coordinatorlayout/coordinatorlayout/api/1.1.0-beta01.txt
similarity index 100%
rename from coordinatorlayout/api/1.1.0-beta01.txt
rename to coordinatorlayout/coordinatorlayout/api/1.1.0-beta01.txt
diff --git a/coordinatorlayout/api/1.1.0-beta02.txt b/coordinatorlayout/coordinatorlayout/api/1.1.0-beta02.txt
similarity index 100%
rename from coordinatorlayout/api/1.1.0-beta02.txt
rename to coordinatorlayout/coordinatorlayout/api/1.1.0-beta02.txt
diff --git a/coordinatorlayout/api/1.1.0-rc01.txt b/coordinatorlayout/coordinatorlayout/api/1.1.0-rc01.txt
similarity index 100%
rename from coordinatorlayout/api/1.1.0-rc01.txt
rename to coordinatorlayout/coordinatorlayout/api/1.1.0-rc01.txt
diff --git a/coordinatorlayout/api/1.2.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/1.2.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/1.2.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/1.2.0-alpha01.txt
diff --git a/coordinatorlayout/api/api_lint.ignore b/coordinatorlayout/coordinatorlayout/api/api_lint.ignore
similarity index 100%
rename from coordinatorlayout/api/api_lint.ignore
rename to coordinatorlayout/coordinatorlayout/api/api_lint.ignore
diff --git a/coordinatorlayout/api/current.txt b/coordinatorlayout/coordinatorlayout/api/current.txt
similarity index 100%
rename from coordinatorlayout/api/current.txt
rename to coordinatorlayout/coordinatorlayout/api/current.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_1.0.0.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_1.0.0.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.0.0.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_1.1.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_1.1.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-alpha01.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_1.1.0-beta01.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_1.1.0-beta01.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-beta01.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_1.1.0-beta02.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-beta02.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_1.1.0-beta02.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-beta02.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_1.1.0-rc01.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-rc01.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_1.1.0-rc01.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.1.0-rc01.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_1.2.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.2.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_1.2.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_1.2.0-alpha01.txt
diff --git a/coordinatorlayout/api/public_plus_experimental_current.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_current.txt
similarity index 100%
rename from coordinatorlayout/api/public_plus_experimental_current.txt
rename to coordinatorlayout/coordinatorlayout/api/public_plus_experimental_current.txt
diff --git a/coordinatorlayout/api/res-1.1.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/res-1.1.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/res-1.1.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/res-1.1.0-alpha01.txt
diff --git a/coordinatorlayout/api/res-1.1.0-alpha02.txt b/coordinatorlayout/coordinatorlayout/api/res-1.1.0-alpha02.txt
similarity index 100%
rename from coordinatorlayout/api/res-1.1.0-alpha02.txt
rename to coordinatorlayout/coordinatorlayout/api/res-1.1.0-alpha02.txt
diff --git a/coordinatorlayout/api/res-1.1.0-beta01.txt b/coordinatorlayout/coordinatorlayout/api/res-1.1.0-beta01.txt
similarity index 100%
rename from coordinatorlayout/api/res-1.1.0-beta01.txt
rename to coordinatorlayout/coordinatorlayout/api/res-1.1.0-beta01.txt
diff --git a/coordinatorlayout/api/res-1.1.0-beta02.txt b/coordinatorlayout/coordinatorlayout/api/res-1.1.0-beta02.txt
similarity index 100%
rename from coordinatorlayout/api/res-1.1.0-beta02.txt
rename to coordinatorlayout/coordinatorlayout/api/res-1.1.0-beta02.txt
diff --git a/coordinatorlayout/api/res-1.1.0-rc01.txt b/coordinatorlayout/coordinatorlayout/api/res-1.1.0-rc01.txt
similarity index 100%
rename from coordinatorlayout/api/res-1.1.0-rc01.txt
rename to coordinatorlayout/coordinatorlayout/api/res-1.1.0-rc01.txt
diff --git a/coordinatorlayout/api/res-1.2.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/res-1.2.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/res-1.2.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/res-1.2.0-alpha01.txt
diff --git a/coordinatorlayout/api/restricted_1.0.0.txt b/coordinatorlayout/coordinatorlayout/api/restricted_1.0.0.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_1.0.0.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_1.0.0.txt
diff --git a/coordinatorlayout/api/restricted_1.1.0-alpha02.txt b/coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-alpha02.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_1.1.0-alpha02.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-alpha02.txt
diff --git a/coordinatorlayout/api/restricted_1.1.0-beta01.txt b/coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_1.1.0-beta01.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-beta01.txt
diff --git a/coordinatorlayout/api/restricted_1.1.0-beta02.txt b/coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-beta02.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_1.1.0-beta02.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-beta02.txt
diff --git a/coordinatorlayout/api/restricted_1.1.0-rc01.txt b/coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-rc01.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_1.1.0-rc01.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_1.1.0-rc01.txt
diff --git a/coordinatorlayout/api/restricted_1.2.0-alpha01.txt b/coordinatorlayout/coordinatorlayout/api/restricted_1.2.0-alpha01.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_1.2.0-alpha01.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_1.2.0-alpha01.txt
diff --git a/coordinatorlayout/api/restricted_current.txt b/coordinatorlayout/coordinatorlayout/api/restricted_current.txt
similarity index 100%
rename from coordinatorlayout/api/restricted_current.txt
rename to coordinatorlayout/coordinatorlayout/api/restricted_current.txt
diff --git a/coordinatorlayout/api_legacy/0.0.0.txt b/coordinatorlayout/coordinatorlayout/api_legacy/0.0.0.txt
similarity index 100%
rename from coordinatorlayout/api_legacy/0.0.0.txt
rename to coordinatorlayout/coordinatorlayout/api_legacy/0.0.0.txt
diff --git a/coordinatorlayout/api_legacy/28.0.0-alpha1.txt b/coordinatorlayout/coordinatorlayout/api_legacy/28.0.0-alpha1.txt
similarity index 100%
rename from coordinatorlayout/api_legacy/28.0.0-alpha1.txt
rename to coordinatorlayout/coordinatorlayout/api_legacy/28.0.0-alpha1.txt
diff --git a/coordinatorlayout/api_legacy/current.txt b/coordinatorlayout/coordinatorlayout/api_legacy/current.txt
similarity index 100%
rename from coordinatorlayout/api_legacy/current.txt
rename to coordinatorlayout/coordinatorlayout/api_legacy/current.txt
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/coordinatorlayout/build.gradle
similarity index 100%
rename from coordinatorlayout/build.gradle
rename to coordinatorlayout/coordinatorlayout/build.gradle
diff --git a/coordinatorlayout/lint-baseline.xml b/coordinatorlayout/coordinatorlayout/lint-baseline.xml
similarity index 100%
rename from coordinatorlayout/lint-baseline.xml
rename to coordinatorlayout/coordinatorlayout/lint-baseline.xml
diff --git a/coordinatorlayout/proguard-rules.pro b/coordinatorlayout/coordinatorlayout/proguard-rules.pro
similarity index 100%
rename from coordinatorlayout/proguard-rules.pro
rename to coordinatorlayout/coordinatorlayout/proguard-rules.pro
diff --git a/coordinatorlayout/src/androidTest/AndroidManifest.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/AndroidManifest.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/AndroidManifest.xml
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/BaseTestActivity.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/BaseTestActivity.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/BaseTestActivity.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/BaseTestActivity.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomBar.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomBar.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomBar.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomBar.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView2.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView2.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView2.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/CustomTextView2.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/TestFloatingBehavior.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/TestFloatingBehavior.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/TestFloatingBehavior.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/custom/TestFloatingBehavior.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/testutils/CoordinatorLayoutUtils.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/testutils/CoordinatorLayoutUtils.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/testutils/CoordinatorLayoutUtils.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/testutils/CoordinatorLayoutUtils.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseTestActivity.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseTestActivity.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseTestActivity.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseTestActivity.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutActivity.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutActivity.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutActivity.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutActivity.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTouchEventTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTouchEventTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTouchEventTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTouchEventTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraphTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraphTest.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraphTest.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraphTest.java
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DynamicCoordinatorLayoutActivity.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DynamicCoordinatorLayoutActivity.java
similarity index 100%
rename from coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DynamicCoordinatorLayoutActivity.java
rename to coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DynamicCoordinatorLayoutActivity.java
diff --git a/coordinatorlayout/src/androidTest/res/layout/activity_coordinator_layout.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/activity_coordinator_layout.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/activity_coordinator_layout.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/activity_coordinator_layout.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_annotation.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_annotation.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_annotation.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_annotation.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_interface.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_interface.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_interface.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_interface.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_layout_attr.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_layout_attr.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_layout_attr.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_layout_attr.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_runtime.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_runtime.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_runtime.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/design_snackbar_behavior_runtime.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/dynamic_coordinator_layout.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/dynamic_coordinator_layout.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/dynamic_coordinator_layout.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/dynamic_coordinator_layout.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/emulated_snackbar.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/emulated_snackbar.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/emulated_snackbar.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/emulated_snackbar.xml
diff --git a/coordinatorlayout/src/androidTest/res/layout/include_nestedscrollview.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/include_nestedscrollview.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/layout/include_nestedscrollview.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/layout/include_nestedscrollview.xml
diff --git a/coordinatorlayout/src/androidTest/res/values/ids.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/values/ids.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/values/ids.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/values/ids.xml
diff --git a/coordinatorlayout/src/androidTest/res/values/styles.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/res/values/styles.xml
similarity index 100%
rename from coordinatorlayout/src/androidTest/res/values/styles.xml
rename to coordinatorlayout/coordinatorlayout/src/androidTest/res/values/styles.xml
diff --git a/coordinatorlayout/src/main/AndroidManifest.xml b/coordinatorlayout/coordinatorlayout/src/main/AndroidManifest.xml
similarity index 100%
rename from coordinatorlayout/src/main/AndroidManifest.xml
rename to coordinatorlayout/coordinatorlayout/src/main/AndroidManifest.xml
diff --git a/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java b/coordinatorlayout/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java
similarity index 100%
rename from coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java
rename to coordinatorlayout/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java
diff --git a/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.java b/coordinatorlayout/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.java
similarity index 100%
rename from coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.java
rename to coordinatorlayout/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/DirectedAcyclicGraph.java
diff --git a/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/ViewGroupUtils.java b/coordinatorlayout/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/ViewGroupUtils.java
similarity index 100%
rename from coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/ViewGroupUtils.java
rename to coordinatorlayout/coordinatorlayout/src/main/java/androidx/coordinatorlayout/widget/ViewGroupUtils.java
diff --git a/coordinatorlayout/src/main/res-public/values/public_attrs.xml b/coordinatorlayout/coordinatorlayout/src/main/res-public/values/public_attrs.xml
similarity index 100%
rename from coordinatorlayout/src/main/res-public/values/public_attrs.xml
rename to coordinatorlayout/coordinatorlayout/src/main/res-public/values/public_attrs.xml
diff --git a/coordinatorlayout/src/main/res-public/values/public_styles.xml b/coordinatorlayout/coordinatorlayout/src/main/res-public/values/public_styles.xml
similarity index 100%
rename from coordinatorlayout/src/main/res-public/values/public_styles.xml
rename to coordinatorlayout/coordinatorlayout/src/main/res-public/values/public_styles.xml
diff --git a/coordinatorlayout/src/main/res/values/attrs.xml b/coordinatorlayout/coordinatorlayout/src/main/res/values/attrs.xml
similarity index 100%
rename from coordinatorlayout/src/main/res/values/attrs.xml
rename to coordinatorlayout/coordinatorlayout/src/main/res/values/attrs.xml
diff --git a/coordinatorlayout/src/main/res/values/styles.xml b/coordinatorlayout/coordinatorlayout/src/main/res/values/styles.xml
similarity index 100%
rename from coordinatorlayout/src/main/res/values/styles.xml
rename to coordinatorlayout/coordinatorlayout/src/main/res/values/styles.xml
diff --git a/samples/SupportContentDemos/build.gradle b/samples/SupportContentDemos/build.gradle
index e8325b9..515838b 100644
--- a/samples/SupportContentDemos/build.gradle
+++ b/samples/SupportContentDemos/build.gradle
@@ -29,7 +29,7 @@
implementation(project(":appcompat:appcompat"))
implementation(project(":contentpager:contentpager"))
implementation(project(":cardview:cardview"))
- implementation(project(":coordinatorlayout"))
+ implementation(project(":coordinatorlayout:coordinatorlayout"))
implementation(project(":core:core"))
}
diff --git a/settings.gradle b/settings.gradle
index 347a2fa..a5b0a00 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -103,7 +103,7 @@
includeProject(":concurrent:concurrent-futures-ktx", "concurrent/futures-ktx")
includeProject(":contentaccess", "contentaccess")
includeProject(":contentpager:contentpager", "contentpager/contentpager")
-includeProject(":coordinatorlayout", "coordinatorlayout")
+includeProject(":coordinatorlayout:coordinatorlayout", "coordinatorlayout/coordinatorlayout")
includeProject(":core:core", "core/core")
includeProject(":core:core-ktx", "core/core-ktx")
includeProject(":core-role", "core/core-role")
