diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-04-22 08:59:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 08:59:39 +0200 |
| commit | ff22099b88ebb9edd46a329b9af2846e42ce43d1 (patch) | |
| tree | 10e426abd271d266edf99bc5c611ca1f0370a2d6 /app/src/main/AndroidManifest.xml | |
| parent | 2cb4656d121e18f8525ebd5085e04ba592140ab1 (diff) | |
| parent | 7626f14d524d68830f8977afe325bcb7edc9f71b (diff) | |
| download | AntennaPod-ff22099b88ebb9edd46a329b9af2846e42ce43d1.zip | |
Merge pull request #2641 from ByteHamster/feed-info-and-settings
Split feed info and settings
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 23dc8b570..c84b0110b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -105,7 +105,15 @@ android:value="de.danoeh.antennapod.activity.MainActivity"/> </activity> - <activity android:name=".activity.FeedInfoActivity"> + <activity + android:name=".activity.FeedInfoActivity" + android:label="@string/feed_info_label"> + </activity> + + <activity + android:name=".activity.FeedSettingsActivity" + android:windowSoftInputMode="stateHidden" + android:label="@string/feed_settings_label"> </activity> <service |