Finish and remove task

pull/194/merge
M66B 4 years ago
parent 39d326ccd9
commit 00453147d2

@ -129,7 +129,6 @@
<activity <activity
android:name=".ActivityMain" android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent"> android:theme="@style/Theme.AppCompat.Translucent">
@ -220,7 +219,6 @@
<activity <activity
android:name=".ActivitySearch" android:name=".ActivitySearch"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_search" android:label="@string/app_search"
@ -246,7 +244,6 @@
<activity <activity
android:name=".ActivityAnswer" android:name=".ActivityAnswer"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@drawable/twotone_reply_24" android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer" android:label="@string/app_answer"
@ -360,7 +357,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access --> <!-- https://developer.android.com/training/permissions/explaining-access -->
<activity <activity
android:name=".ActivityRationale" android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"

@ -128,7 +128,6 @@
<activity <activity
android:name=".ActivityMain" android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent"> android:theme="@style/Theme.AppCompat.Translucent">
@ -219,7 +218,6 @@
<activity <activity
android:name=".ActivitySearch" android:name=".ActivitySearch"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_search" android:label="@string/app_search"
@ -245,7 +243,6 @@
<activity <activity
android:name=".ActivityAnswer" android:name=".ActivityAnswer"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@drawable/twotone_reply_24" android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer" android:label="@string/app_answer"
@ -359,7 +356,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access --> <!-- https://developer.android.com/training/permissions/explaining-access -->
<activity <activity
android:name=".ActivityRationale" android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"

@ -128,7 +128,6 @@
<activity <activity
android:name=".ActivityMain" android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent"> android:theme="@style/Theme.AppCompat.Translucent">
@ -219,7 +218,6 @@
<activity <activity
android:name=".ActivitySearch" android:name=".ActivitySearch"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_search" android:label="@string/app_search"
@ -245,7 +243,6 @@
<activity <activity
android:name=".ActivityAnswer" android:name=".ActivityAnswer"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@drawable/twotone_reply_24" android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer" android:label="@string/app_answer"
@ -359,7 +356,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access --> <!-- https://developer.android.com/training/permissions/explaining-access -->
<activity <activity
android:name=".ActivityRationale" android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"

@ -218,7 +218,6 @@
<activity <activity
android:name=".ActivitySearch" android:name=".ActivitySearch"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_search" android:label="@string/app_search"
@ -244,7 +243,6 @@
<activity <activity
android:name=".ActivityAnswer" android:name=".ActivityAnswer"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@drawable/twotone_reply_24" android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer" android:label="@string/app_answer"
@ -358,7 +356,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access --> <!-- https://developer.android.com/training/permissions/explaining-access -->
<activity <activity
android:name=".ActivityRationale" android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"

@ -49,7 +49,7 @@ public class ActivityAnswer extends ActivityBase {
Intent intent = getIntent(); Intent intent = getIntent();
if (intent == null) { if (intent == null) {
finish(); finishAndRemoveTask();
return; return;
} }
@ -96,7 +96,7 @@ public class ActivityAnswer extends ActivityBase {
setResult(RESULT_OK, result); setResult(RESULT_OK, result);
} }
finish(); finishAndRemoveTask();
} }
}); });

@ -29,6 +29,6 @@ public class ActivityRationale extends ActivityBase {
// https://developer.android.com/training/permissions/explaining-access // https://developer.android.com/training/permissions/explaining-access
Helper.viewFAQ(this, 1); Helper.viewFAQ(this, 1);
finish(); finishAndRemoveTask();
} }
} }

@ -50,6 +50,6 @@ public class ActivitySearch extends ActivityBase {
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(view); startActivity(view);
finish(); finishAndRemoveTask();
} }
} }

@ -129,7 +129,6 @@
<activity <activity
android:name=".ActivityMain" android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent"> android:theme="@style/Theme.AppCompat.Translucent">
@ -220,7 +219,6 @@
<activity <activity
android:name=".ActivitySearch" android:name=".ActivitySearch"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_search" android:label="@string/app_search"
@ -246,7 +244,6 @@
<activity <activity
android:name=".ActivityAnswer" android:name=".ActivityAnswer"
android:enabled="false" android:enabled="false"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@drawable/twotone_reply_24" android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer" android:label="@string/app_answer"
@ -360,7 +357,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access --> <!-- https://developer.android.com/training/permissions/explaining-access -->
<activity <activity
android:name=".ActivityRationale" android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"

Loading…
Cancel
Save