diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-07-04 23:09:01 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-07-04 23:09:01 +0300 |
| commit | 4db96f47c98fc23ab07d3b278c7737be9918a98d (patch) | |
| tree | f72a1eb866a05bd857fbd698b06240e6f7d7bc50 /app/src/main/AndroidManifest.xml | |
| parent | a8d8a5538fb0dddb8a0f762ca3d84919fdaa4b93 (diff) | |
| parent | 6cf7a252e57bfea325101ff5d2f9bfca36099171 (diff) | |
Merge branch 'master' into 289-upload-sources
# Conflicts:
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 008a5554f..af5f83305 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ <uses-permission android:name="android.permission.READ_CONTACTS" /> <application - android:name="it.niedermann.nextcloud.deck.Application" + android:name="it.niedermann.nextcloud.deck.DeckApplication" android:allowBackup="true" android:fullBackupContent="false" android:hardwareAccelerated="true" @@ -71,20 +71,17 @@ <activity android:name=".ui.archivedcards.ArchivedCardsActvitiy" android:label="@string/archived_cards" - android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" - android:theme="@style/AppTheme" /> + android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" /> <activity android:name=".ui.archivedboards.ArchivedBoardsActvitiy" android:label="@string/archived_boards" - android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" - android:theme="@style/AppTheme" /> + android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" /> <activity android:name=".ui.card.EditActivity" android:label="@string/edit" - android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" - android:theme="@style/AppTheme" /> + android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" /> <activity android:name=".ui.attachments.AttachmentsActivity" @@ -95,19 +92,16 @@ <activity android:name=".ui.settings.SettingsActivity" android:label="@string/simple_settings" - android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" - android:theme="@style/AppTheme" /> + android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" /> <activity android:name=".ui.ImportAccountActivity" - android:label="@string/app_name" - android:theme="@style/AppTheme" /> + android:label="@string/app_name" /> <activity android:name=".ui.preparecreate.PrepareCreateActivity" android:description="@string/add_a_new_card_using_the_button" - android:label="@string/add_card" - android:theme="@style/AppTheme"> + android:label="@string/add_card" > <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -119,13 +113,11 @@ <activity android:name=".ui.about.AboutActivity" android:label="@string/about" - android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" - android:theme="@style/AppTheme" /> + android:parentActivityName="it.niedermann.nextcloud.deck.ui.MainActivity" /> <activity android:name=".ui.PushNotificationActivity" - android:label="@string/app_name" - android:theme="@style/AppTheme"> + android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> </intent-filter> |