diff options
| author | TacoTheDank <SkytkRSfan3895@gmail.com> | 2020-05-05 19:04:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 19:04:19 +0000 |
| commit | fc284a3dc01a99234785a0633630931f5abad648 (patch) | |
| tree | dbf563a7fb6cf7b03dc18b83a57154624eaae566 /app/src/main/AndroidManifest.xml | |
| parent | bac83aa1c7b368d0736fc4dc9bd167dbedb971e0 (diff) | |
| parent | eefc8e869d74721ffd41bd7295ae88228a7cca1e (diff) | |
| download | infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.tar infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.tar.gz infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.tar.bz2 infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.tar.lz infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.tar.xz infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.tar.zst infinity-for-reddit-fc284a3dc01a99234785a0633630931f5abad648.zip | |
Merge branch 'master' into master
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b665b78b..08f83a69 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,14 +21,20 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true" tools:replace="android:label"> - <activity android:name=".Activity.SelectedSubredditsActivity" + <activity android:name=".Activity.ReportActivity" + android:label="@string/report_activity_label" + android:parentActivityName=".Activity.MainActivity" + android:theme="@style/AppTheme.NoActionBar"/> + <activity + android:name=".Activity.SelectedSubredditsActivity" android:label="@string/selected_subeddits_activity_label" android:parentActivityName=".Activity.MainActivity" android:theme="@style/AppTheme.NoActionBar" /> - <activity android:name=".Activity.EditMultiRedditActivity" + <activity + android:name=".Activity.EditMultiRedditActivity" android:label="@string/edit_multi_reddit_activity_label" android:parentActivityName=".Activity.MainActivity" - android:theme="@style/AppTheme.NoActionBar"/> + android:theme="@style/AppTheme.NoActionBar" /> <activity android:name=".Activity.ThemePreviewActivity" android:label="@string/theme_preview_activity_label" |