Remove requirement to add Activity to manifest if you use ComposeTestRule in your module

Instead we can just add it once right in the test module

Test: manually
Change-Id: I887f4a71588733659e152fedac1d49727377f125

18 files changed, 28 insertions, 130 deletions

diff --git a/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml b/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
index 33694938517..a7345d63a99 100644
--- a/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
+++ b/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
@@ -25,7 +25,5 @@
     <application
         android:requestLegacyExternalStorage="true"
         android:debuggable="false"
-        tools:replace="android:debuggable">
-        <activity android:name="android.app.Activity"/>
-    </application>
+        tools:replace="android:debuggable" />
 </manifest>
diff --git a/ui/integration-tests/benchmark/src/main/AndroidManifest.xml b/ui/integration-tests/benchmark/src/main/AndroidManifest.xml
index 30398812024..8504493fd48 100644
--- a/ui/integration-tests/benchmark/src/main/AndroidManifest.xml
+++ b/ui/integration-tests/benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest package="androidx.ui.benchmark" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.ui.benchmark">
+
+    <application>
+        <activity
+            android:name="android.app.Activity"
+            android:theme="@style/TestTheme" />
+    </application>
 </manifest>
diff --git a/ui/ui-material/icons/extended/src/androidTest/res/values/styles.xml b/ui/integration-tests/benchmark/src/main/res/values/styles.xml
index 43e2d555c7f..43e2d555c7f 100644
--- a/ui/ui-material/icons/extended/src/androidTest/res/values/styles.xml
+++ b/ui/integration-tests/benchmark/src/main/res/values/styles.xml
diff --git a/ui/integration-tests/test/src/androidTest/AndroidManifest.xml b/ui/integration-tests/test/src/androidTest/AndroidManifest.xml
index ac10ee76144..c5ef3837d75 100644
--- a/ui/integration-tests/test/src/androidTest/AndroidManifest.xml
+++ b/ui/integration-tests/test/src/androidTest/AndroidManifest.xml
@@ -14,10 +14,4 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest package="androidx.ui.integration.test"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <application>
-        <activity android:name="android.app.Activity"
-            android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
-    </application>
-</manifest>
+<manifest package="androidx.ui.integration.test" />
\ No newline at end of file
diff --git a/ui/ui-android-view/src/androidTest/AndroidManifest.xml b/ui/ui-android-view/src/androidTest/AndroidManifest.xml
index e7415d925ff..02cdcbe8a4a 100644
--- a/ui/ui-android-view/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-android-view/src/androidTest/AndroidManifest.xml
@@ -26,11 +26,5 @@ package="androidx.ui.androidview.test">
     android:requestLegacyExternalStorage="true"
     android:debuggable="false"
     tools:ignore="HardcodedDebugMode"
-    tools:replace="android:debuggable">
-
-    <activity
-        android:name="android.app.Activity"
-        android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
-
-</application>
+    tools:replace="android:debuggable" />
 </manifest>
diff --git a/ui/ui-animation/src/androidTest/AndroidManifest.xml b/ui/ui-animation/src/androidTest/AndroidManifest.xml
index 44f489a38f4..79620aa2b3a 100644
--- a/ui/ui-animation/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-animation/src/androidTest/AndroidManifest.xml
@@ -14,12 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.ui.animation.test">
-    <application
-        android:process="androidx.ui.animation">
-        <activity
-            android:name="android.app.Activity"
-            android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
-    </application>
-</manifest>
+<manifest package="androidx.ui.animation.test" />
diff --git a/ui/ui-foundation/src/androidTest/AndroidManifest.xml b/ui/ui-foundation/src/androidTest/AndroidManifest.xml
index b52a1f84762..94d3439d8f5 100644
--- a/ui/ui-foundation/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-foundation/src/androidTest/AndroidManifest.xml
@@ -14,16 +14,4 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.ui.foundation.test">
-    <application
-        android:requestLegacyExternalStorage="true"
-        android:debuggable="false"
-        tools:ignore="HardcodedDebugMode"
-        tools:replace="android:debuggable">
-        <activity
-            android:name="android.app.Activity"
-            android:theme="@style/TestTheme"/>
-    </application>
-</manifest>
+<manifest package="androidx.ui.foundation.test " />
diff --git a/ui/ui-foundation/src/androidTest/res/values/styles.xml b/ui/ui-foundation/src/androidTest/res/values/styles.xml
deleted file mode 100644
index 4310d179419..00000000000
--- a/ui/ui-foundation/src/androidTest/res/values/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-    <style name="TestTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/ui/ui-framework/src/androidTest/AndroidManifest.xml b/ui/ui-framework/src/androidTest/AndroidManifest.xml
index a9b35258ced..d8cab4b532d 100644
--- a/ui/ui-framework/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-framework/src/androidTest/AndroidManifest.xml
@@ -19,9 +19,6 @@
         <activity
             android:name="androidx.ui.framework.test.TestActivity"
             android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
-        <activity
-            android:name="android.app.Activity"
-            android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
         <activity android:name="androidx.activity.ComponentActivity" />
     </application>
 </manifest>
diff --git a/ui/ui-layout/src/androidTest/AndroidManifest.xml b/ui/ui-layout/src/androidTest/AndroidManifest.xml
index 7e96dcfedc2..c3ad434b39f 100644
--- a/ui/ui-layout/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-layout/src/androidTest/AndroidManifest.xml
@@ -30,9 +30,5 @@
         <activity
             android:name="androidx.ui.layout.test.TestActivity"
             android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
-
-        <activity
-            android:name="android.app.Activity"
-            android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
     </application>
 </manifest>
diff --git a/ui/ui-material/icons/extended/src/androidTest/AndroidManifest.xml b/ui/ui-material/icons/extended/src/androidTest/AndroidManifest.xml
index 0faafd15a24..88c60320274 100644
--- a/ui/ui-material/icons/extended/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-material/icons/extended/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<manifest package="androidx.ui.material.icons" xmlns:android="http://schemas.android.com/apk/res/android">
-    <application>
-         <activity android:name="android.app.Activity" android:theme="@style/TestTheme"/>
-     </application>
-</manifest>
+<manifest package="androidx.ui.material.icons" />
diff --git a/ui/ui-material/src/androidTest/AndroidManifest.xml b/ui/ui-material/src/androidTest/AndroidManifest.xml
index 7aa311bb780..1b205548bbf 100644
--- a/ui/ui-material/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-material/src/androidTest/AndroidManifest.xml
@@ -14,9 +14,4 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.ui.material.test">
-    <application>
-        <activity android:name="android.app.Activity" android:theme="@style/TestTheme"/>
-    </application>
-</manifest>
+<manifest package="androidx.ui.material.test" />
diff --git a/ui/ui-material/src/androidTest/res/values/styles.xml b/ui/ui-material/src/androidTest/res/values/styles.xml
deleted file mode 100644
index 4310d179419..00000000000
--- a/ui/ui-material/src/androidTest/res/values/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-    <style name="TestTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/ui/ui-platform/src/androidTest/AndroidManifest.xml b/ui/ui-platform/src/androidTest/AndroidManifest.xml
index baad0b1e5ab..d83f90e0dad 100644
--- a/ui/ui-platform/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-platform/src/androidTest/AndroidManifest.xml
@@ -13,11 +13,5 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.ui.platform.test">
-    <application>
-        <activity android:name="android.app.Activity"
-                  android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
-    </application>
-</manifest>
+<manifest package="androidx.ui.platform.test" />
 
diff --git a/ui/ui-saved-instance-state/src/androidTest/AndroidManifest.xml b/ui/ui-saved-instance-state/src/androidTest/AndroidManifest.xml
index 048cc8cb037..f5c131e0483 100644
--- a/ui/ui-saved-instance-state/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-saved-instance-state/src/androidTest/AndroidManifest.xml
@@ -22,17 +22,8 @@
         android:debuggable="false"
         tools:ignore="HardcodedDebugMode"
         tools:replace="android:debuggable">
-        <activity
-            android:name="android.app.Activity"
-            android:theme="@style/TestTheme"/>
-        <activity
-            android:name="androidx.ui.savedinstancestate.RecreationTest1Activity"
-            android:theme="@style/TestTheme"/>
-        <activity
-            android:name="androidx.ui.savedinstancestate.RecreationTest2Activity"
-            android:theme="@style/TestTheme"/>
-        <activity
-            android:name="androidx.ui.savedinstancestate.RecreationTest3Activity"
-            android:theme="@style/TestTheme"/>
+        <activity android:name="androidx.ui.savedinstancestate.RecreationTest1Activity" />
+        <activity android:name="androidx.ui.savedinstancestate.RecreationTest2Activity" />
+        <activity android:name="androidx.ui.savedinstancestate.RecreationTest3Activity" />
     </application>
 </manifest>
diff --git a/ui/ui-test/src/androidTest/AndroidManifest.xml b/ui/ui-test/src/androidTest/AndroidManifest.xml
index 096bba2df2e..7d6f531cf9d 100644
--- a/ui/ui-test/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-test/src/androidTest/AndroidManifest.xml
@@ -17,8 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.ui.test.test">
     <application>
-        <activity android:name="android.app.Activity"
-            android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
         <activity android:name="androidx.ui.test.CustomActivity"
             android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
         <activity android:name="androidx.ui.test.ActivityWithActionBar" />
diff --git a/ui/ui-test/src/main/AndroidManifest.xml b/ui/ui-test/src/main/AndroidManifest.xml
index dd3a417c60a..0b23e10a087 100644
--- a/ui/ui-test/src/main/AndroidManifest.xml
+++ b/ui/ui-test/src/main/AndroidManifest.xml
@@ -13,4 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest package="androidx.ui.test" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.ui.test">
+
+    <application>
+        <activity
+            android:name="android.app.Activity"
+            android:theme="@style/TestTheme" />
+    </application>
+</manifest>
diff --git a/ui/ui-saved-instance-state/src/androidTest/res/values/styles.xml b/ui/ui-test/src/main/res/values/styles.xml
index 43e2d555c7f..43e2d555c7f 100644
--- a/ui/ui-saved-instance-state/src/androidTest/res/values/styles.xml
+++ b/ui/ui-test/src/main/res/values/styles.xml