From 310ee1f0ec213dee8da239cfc9f8bd42e20b4304 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 28 Sep 2017 13:19:35 +0200
Subject: [PATCH] Correctly set parent activities and API level
---
app/build.gradle.kts | 2 +-
app/src/main/AndroidManifest.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 414ed3f05..924dc7ebb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
}
defaultConfig {
- minSdkVersion(15)
+ minSdkVersion(16)
targetSdkVersion(26)
applicationId = "de.kuschku.quasseldroid_ng.test"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7eb77f248..11dff7804 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,12 +22,14 @@
android:name=".ui.setup.accounts.AccountSetupActivity"
android:exported="false"
android:label="@string/app_name"
+ android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
android:theme="@style/SplashTheme"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.setup.accounts.AccountEditActivity"
android:exported="false"
android:label="@string/app_name"
+ android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
android:theme="@style/SplashTheme"
android:windowSoftInputMode="adjustResize" />
<activity
--
GitLab