diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-04-13 14:56:40 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-04-13 14:56:40 +0300 |
| commit | cd413007944da05502e9b7cdcc615cecb9202b02 (patch) | |
| tree | 1aa8051322eac9b7b828d01ca4189ff17a06e8ba /app/src/main/AndroidManifest.xml | |
| parent | 83860875c6111a2476d37f3ff046ca933e473707 (diff) | |
| parent | ec7aca7c99c678551227bd51861ad8e661cd3718 (diff) | |
Merge branch 'master' into push-notifications-receiver
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21ae51972..432c2da98 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,18 +57,18 @@ </activity> <activity - android:name=".ui.EditActivity" + android:name=".ui.card.EditActivity" android:label="@string/edit" android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" android:theme="@style/AppTheme" /> <activity - android:name=".ui.AttachmentsActivity" - android:parentActivityName="it.niedermann.nextcloud.deck.ui.EditActivity" + android:name=".ui.attachments.AttachmentsActivity" + android:parentActivityName="it.niedermann.nextcloud.deck.ui.card.EditActivity" android:theme="@style/TransparentTheme" /> <activity - android:name=".ui.SettingsActivity" + android:name=".ui.settings.SettingsActivity" android:label="@string/simple_settings" android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" android:theme="@style/AppTheme" /> @@ -79,7 +79,12 @@ android:theme="@style/AppTheme" /> <activity - android:name=".ui.AboutActivity" + android:name=".ui.preparecreate.PrepareCreateActivity" + android:label="@string/simple_select" + android:theme="@style/AppTheme" /> + + <activity + android:name=".ui.about.AboutActivity" android:label="@string/about" android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" android:theme="@style/AppTheme" /> |