Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6878 from robolectric/piper_410977593
Cleanup of AndroidManifest Activity references.
- Loading branch information
Showing
2 changed files
with
56 additions
and
0 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
integration_tests/androidx_test/src/main/AndroidManifest-NoTestPackageActivities.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| Manifest for ATSL integration tests | ||
| --> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="org.robolectric.integration.axt"> | ||
| <uses-sdk android:targetSdkVersion="28"/> | ||
|
|
||
| <uses-permission android:name="android.permission.READ_CONTACTS"/> | ||
|
|
||
| <application> | ||
| <activity android:name="org.robolectric.integrationtests.axt.EspressoActivity" | ||
| android:label="Activity Label" | ||
| android:exported="true" /> | ||
| <activity android:name="org.robolectric.integrationtests.axt.ActivityWithPlatformMenu" | ||
| android:exported="true"> | ||
| </activity> | ||
| <activity android:name="org.robolectric.integrationtests.axt.ActivityWithAppCompatMenu" | ||
| android:exported="true" | ||
| android:theme="@style/Theme.AppCompat" /> | ||
| <activity android:name="org.robolectric.integrationtests.axt.AppCompatActivityWithToolbarMenu" | ||
| android:exported="true" | ||
| android:theme="@style/Theme.AppCompat.NoActionBar" /> | ||
| <activity android:name="org.robolectric.integrationtests.axt.ActivityWithSwitchCompat" | ||
| android:exported="true" | ||
| android:theme="@style/Theme.AppCompat" /> | ||
| <activity android:name="org.robolectric.integrationtests.axt.StubBrowserActivity" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.VIEW" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| <category android:name="android.intent.category.BROWSABLE" /> | ||
| <data android:scheme="http" /> | ||
| <data android:scheme="https" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
| </manifest> |
18 changes: 18 additions & 0 deletions
18
integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="org.robolectric.integrationtests.axt"> | ||
|
|
||
| <uses-sdk | ||
| android:minSdkVersion="14" | ||
| android:targetSdkVersion="27"/> | ||
|
|
||
| <application> | ||
| <activity android:name=".EspressoActivity" android:exported="true"/> | ||
| </application> | ||
|
|
||
| <instrumentation | ||
| android:name="androidx.test.runner.AndroidJUnitRunner" | ||
| android:targetPackage="org.robolectric.integration.axt"/> | ||
|
|
||
| </manifest> |