Move activity to the new proper directory structure.

Bug: 134082137
Test: ./gradlew assembleDebug
Change-Id: Ifd3ff010765b35211af87fe3faba57a7a86cb421

diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index d54ac18..b1fca11 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle

@@ -34,7 +34,7 @@
 }
 
 dependencies {
-    api(project(":activity"))
+    api(project(":activity:activity"))
     api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-beta01")
     api(KOTLIN_STDLIB)
     androidTestImplementation(JUNIT)

diff --git a/activity/api/1.0.0-alpha01.txt b/activity/activity/api/1.0.0-alpha01.txt
similarity index 100%
rename from activity/api/1.0.0-alpha01.txt
rename to activity/activity/api/1.0.0-alpha01.txt

diff --git a/activity/api/1.0.0-alpha02.txt b/activity/activity/api/1.0.0-alpha02.txt
similarity index 100%
rename from activity/api/1.0.0-alpha02.txt
rename to activity/activity/api/1.0.0-alpha02.txt

diff --git a/activity/api/1.0.0-alpha03.txt b/activity/activity/api/1.0.0-alpha03.txt
similarity index 100%
rename from activity/api/1.0.0-alpha03.txt
rename to activity/activity/api/1.0.0-alpha03.txt

diff --git a/activity/api/1.0.0-alpha04.txt b/activity/activity/api/1.0.0-alpha04.txt
similarity index 100%
rename from activity/api/1.0.0-alpha04.txt
rename to activity/activity/api/1.0.0-alpha04.txt

diff --git a/activity/api/1.0.0-alpha05.txt b/activity/activity/api/1.0.0-alpha05.txt
similarity index 100%
rename from activity/api/1.0.0-alpha05.txt
rename to activity/activity/api/1.0.0-alpha05.txt

diff --git a/activity/api/1.0.0-alpha06.txt b/activity/activity/api/1.0.0-alpha06.txt
similarity index 100%
rename from activity/api/1.0.0-alpha06.txt
rename to activity/activity/api/1.0.0-alpha06.txt

diff --git a/activity/api/1.0.0-alpha07.txt b/activity/activity/api/1.0.0-alpha07.txt
similarity index 100%
rename from activity/api/1.0.0-alpha07.txt
rename to activity/activity/api/1.0.0-alpha07.txt

diff --git a/activity/api/1.0.0-alpha08.txt b/activity/activity/api/1.0.0-alpha08.txt
similarity index 100%
rename from activity/api/1.0.0-alpha08.txt
rename to activity/activity/api/1.0.0-alpha08.txt

diff --git a/activity/api/1.0.0-beta01.txt b/activity/activity/api/1.0.0-beta01.txt
similarity index 100%
rename from activity/api/1.0.0-beta01.txt
rename to activity/activity/api/1.0.0-beta01.txt

diff --git a/activity/api/current.txt b/activity/activity/api/current.txt
similarity index 100%
rename from activity/api/current.txt
rename to activity/activity/api/current.txt

diff --git a/activity/api/res-1.0.0-alpha03.txt b/activity/activity/api/res-1.0.0-alpha03.txt
similarity index 100%
rename from activity/api/res-1.0.0-alpha03.txt
rename to activity/activity/api/res-1.0.0-alpha03.txt

diff --git a/activity/api/res-1.0.0-alpha04.txt b/activity/activity/api/res-1.0.0-alpha04.txt
similarity index 100%
rename from activity/api/res-1.0.0-alpha04.txt
rename to activity/activity/api/res-1.0.0-alpha04.txt

diff --git a/activity/api/res-1.0.0-alpha05.txt b/activity/activity/api/res-1.0.0-alpha05.txt
similarity index 100%
rename from activity/api/res-1.0.0-alpha05.txt
rename to activity/activity/api/res-1.0.0-alpha05.txt

diff --git a/activity/api/res-1.0.0-alpha06.txt b/activity/activity/api/res-1.0.0-alpha06.txt
similarity index 100%
rename from activity/api/res-1.0.0-alpha06.txt
rename to activity/activity/api/res-1.0.0-alpha06.txt

diff --git a/activity/api/res-1.0.0-alpha07.txt b/activity/activity/api/res-1.0.0-alpha07.txt
similarity index 100%
rename from activity/api/res-1.0.0-alpha07.txt
rename to activity/activity/api/res-1.0.0-alpha07.txt

diff --git a/activity/api/res-1.0.0-alpha08.txt b/activity/activity/api/res-1.0.0-alpha08.txt
similarity index 100%
rename from activity/api/res-1.0.0-alpha08.txt
rename to activity/activity/api/res-1.0.0-alpha08.txt

diff --git a/activity/api/res-1.0.0-beta01.txt b/activity/activity/api/res-1.0.0-beta01.txt
similarity index 100%
rename from activity/api/res-1.0.0-beta01.txt
rename to activity/activity/api/res-1.0.0-beta01.txt

diff --git a/activity/api/restricted_1.0.0-alpha05.txt b/activity/activity/api/restricted_1.0.0-alpha05.txt
similarity index 100%
rename from activity/api/restricted_1.0.0-alpha05.txt
rename to activity/activity/api/restricted_1.0.0-alpha05.txt

diff --git a/activity/api/restricted_1.0.0-alpha06.txt b/activity/activity/api/restricted_1.0.0-alpha06.txt
similarity index 100%
rename from activity/api/restricted_1.0.0-alpha06.txt
rename to activity/activity/api/restricted_1.0.0-alpha06.txt

diff --git a/activity/api/restricted_1.0.0-alpha07.txt b/activity/activity/api/restricted_1.0.0-alpha07.txt
similarity index 100%
rename from activity/api/restricted_1.0.0-alpha07.txt
rename to activity/activity/api/restricted_1.0.0-alpha07.txt

diff --git a/activity/api/restricted_1.0.0-alpha08.txt b/activity/activity/api/restricted_1.0.0-alpha08.txt
similarity index 100%
rename from activity/api/restricted_1.0.0-alpha08.txt
rename to activity/activity/api/restricted_1.0.0-alpha08.txt

diff --git a/activity/api/restricted_1.0.0-beta01.txt b/activity/activity/api/restricted_1.0.0-beta01.txt
similarity index 100%
rename from activity/api/restricted_1.0.0-beta01.txt
rename to activity/activity/api/restricted_1.0.0-beta01.txt

diff --git a/activity/api/restricted_current.txt b/activity/activity/api/restricted_current.txt
similarity index 100%
rename from activity/api/restricted_current.txt
rename to activity/activity/api/restricted_current.txt

diff --git a/activity/build.gradle b/activity/activity/build.gradle
similarity index 100%
rename from activity/build.gradle
rename to activity/activity/build.gradle

diff --git a/activity/src/androidTest/AndroidManifest.xml b/activity/activity/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from activity/src/androidTest/AndroidManifest.xml
rename to activity/activity/src/androidTest/AndroidManifest.xml

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/ContentViewTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt
rename to activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt

diff --git a/activity/src/androidTest/java/androidx/activity/Recreater.kt b/activity/activity/src/androidTest/java/androidx/activity/Recreater.kt
similarity index 100%
rename from activity/src/androidTest/java/androidx/activity/Recreater.kt
rename to activity/activity/src/androidTest/java/androidx/activity/Recreater.kt

diff --git a/activity/src/androidTest/res/layout/activity_inflates_res.xml b/activity/activity/src/androidTest/res/layout/activity_inflates_res.xml
similarity index 100%
rename from activity/src/androidTest/res/layout/activity_inflates_res.xml
rename to activity/activity/src/androidTest/res/layout/activity_inflates_res.xml

diff --git a/activity/src/main/AndroidManifest.xml b/activity/activity/src/main/AndroidManifest.xml
similarity index 100%
rename from activity/src/main/AndroidManifest.xml
rename to activity/activity/src/main/AndroidManifest.xml

diff --git a/activity/src/main/java/androidx/activity/Cancellable.java b/activity/activity/src/main/java/androidx/activity/Cancellable.java
similarity index 100%
rename from activity/src/main/java/androidx/activity/Cancellable.java
rename to activity/activity/src/main/java/androidx/activity/Cancellable.java

diff --git a/activity/src/main/java/androidx/activity/ComponentActivity.java b/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
similarity index 100%
rename from activity/src/main/java/androidx/activity/ComponentActivity.java
rename to activity/activity/src/main/java/androidx/activity/ComponentActivity.java

diff --git a/activity/src/main/java/androidx/activity/ImmLeaksCleaner.java b/activity/activity/src/main/java/androidx/activity/ImmLeaksCleaner.java
similarity index 100%
rename from activity/src/main/java/androidx/activity/ImmLeaksCleaner.java
rename to activity/activity/src/main/java/androidx/activity/ImmLeaksCleaner.java

diff --git a/activity/src/main/java/androidx/activity/OnBackPressedCallback.java b/activity/activity/src/main/java/androidx/activity/OnBackPressedCallback.java
similarity index 100%
rename from activity/src/main/java/androidx/activity/OnBackPressedCallback.java
rename to activity/activity/src/main/java/androidx/activity/OnBackPressedCallback.java

diff --git a/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.java b/activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.java
similarity index 100%
rename from activity/src/main/java/androidx/activity/OnBackPressedDispatcher.java
rename to activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.java

diff --git a/activity/src/main/java/androidx/activity/OnBackPressedDispatcherOwner.java b/activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcherOwner.java
similarity index 100%
rename from activity/src/main/java/androidx/activity/OnBackPressedDispatcherOwner.java
rename to activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcherOwner.java

diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index 3649580..57c01dc 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle

@@ -29,7 +29,7 @@
 }
 
 dependencies {
-    implementation(project(":activity"))
+    implementation(project(":activity:activity"))
     androidTestImplementation(LEAKCANARY_INSTRUMENTATION)
     androidTestImplementation(KOTLIN_STDLIB)
     androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)

diff --git a/fragment/build.gradle b/fragment/build.gradle
index 5017776..2af1906 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle

@@ -24,7 +24,7 @@
     api("androidx.viewpager:viewpager:1.0.0")
     api("androidx.annotation:annotation:1.1.0-rc01")
     api("androidx.loader:loader:1.0.0")
-    api(project(":activity"))
+    api(project(":activity:activity"))
     api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
 
     androidTestImplementation(KOTLIN_STDLIB)

diff --git a/lifecycle/integration-tests/kotlintestapp/build.gradle b/lifecycle/integration-tests/kotlintestapp/build.gradle
index 96fb84b..07a47cb 100644
--- a/lifecycle/integration-tests/kotlintestapp/build.gradle
+++ b/lifecycle/integration-tests/kotlintestapp/build.gradle

@@ -27,7 +27,7 @@
 
 dependencies {
     implementation(project(":lifecycle:lifecycle-runtime-ktx"))
-    implementation(project(":activity"))
+    implementation(project(":activity:activity"))
 
     testImplementation(JUNIT)
     testImplementation(TRUTH)

diff --git a/navigation/runtime/build.gradle b/navigation/runtime/build.gradle
index 986c4a4..c14a67e 100644
--- a/navigation/runtime/build.gradle
+++ b/navigation/runtime/build.gradle

@@ -34,7 +34,7 @@
 
 dependencies {
     api(project(":navigation:navigation-common"))
-    api(project(":activity"))
+    api(project(":activity:activity"))
     api("androidx.lifecycle:lifecycle-viewmodel:2.1.0-beta01")
 
     androidTestImplementation(project(":navigation:navigation-testing"))

diff --git a/settings.gradle b/settings.gradle
index 8fc1a9f..579fefb 100644
--- a/settings.gradle
+++ b/settings.gradle

@@ -33,7 +33,7 @@
 //
 /////////////////////////////
 
-includeProject(":activity", "activity")
+includeProject(":activity:activity", "activity/activity")
 includeProject(":activity:activity-ktx", "activity/activity-ktx")
 includeProject(":activity:integration-tests:testapp", "activity/integration-tests/testapp")
 includeProject(":ads-identifier", "ads/ads-identifier")