diff --git a/app/build.gradle b/app/build.gradle index aa2f6f4ae..5bc69408d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,7 +68,7 @@ android { res.srcDirs = ['src/main/res', 'src/fdroid/res','src/common/res'] } lite { - manifest.srcFile "src/main/AndroidManifest.xml" + manifest.srcFile "src/lite/AndroidManifest.xml" java.srcDirs = ['src/main/java', 'src/lite/java'] res.srcDirs = ['src/main/res', 'src/lite/res'] } diff --git a/app/src/common/AndroidManifest.xml b/app/src/common/AndroidManifest.xml index 3e41b1386..d08f233c2 100644 --- a/app/src/common/AndroidManifest.xml +++ b/app/src/common/AndroidManifest.xml @@ -34,6 +34,22 @@ android:usesCleartextTraffic="true" tools:replace="android:allowBackup"> + + + + + + + + + + tools:replace="android:allowBackup,android:icon, android:roundIcon, android:label"> + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cc3b68121..7f856f0b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -115,7 +115,6 @@ @@ -164,20 +163,7 @@ - - - - - - - + @@ -285,7 +268,6 @@ @@ -301,124 +283,105 @@ + /> + /> + /> @@ -426,19 +389,16 @@ android:name="app.fedilab.android.activities.PixelfedComposeActivity" android:configChanges="orientation|screenSize" android:fitsSystemWindows="true" - android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/AppThemeDark" android:windowSoftInputMode="stateAlwaysHidden" />