Remove Android LaunchAdjacent flag for Essentials (#11783)

dotnet · Dec 5, 2022 · 9471446 · 9471446
1 parent 16760d3
commit 9471446
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 22 deletions.
diff --git a/src/Essentials/src/AppInfo/AppInfo.android.cs b/src/Essentials/src/AppInfo/AppInfo.android.cs
@@ -39,8 +39,6 @@ public void ShowSettingsUI()
 			settingsIntent.SetData(global::Android.Net.Uri.Parse("package:" + PackageName));
 
 			var flags = ActivityFlags.NewTask | ActivityFlags.NoHistory | ActivityFlags.ExcludeFromRecents;
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
 			settingsIntent.SetFlags(flags);
 
 			context.StartActivity(settingsIntent);

diff --git a/src/Essentials/src/Email/Email.android.cs b/src/Essentials/src/Email/Email.android.cs
@@ -22,10 +22,6 @@ Task PlatformComposeAsync(EmailMessage message)
 		{
 			var intent = CreateIntent(message);
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
-#endif
 			intent.SetFlags(flags);
 
 			Application.Context.StartActivity(intent);

diff --git a/src/Essentials/src/Launcher/Launcher.android.cs b/src/Essentials/src/Launcher/Launcher.android.cs
@@ -22,10 +22,6 @@ Task<bool> PlatformOpenAsync(Uri uri)
 		{
 			var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri.OriginalString));
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
-#endif
 			intent.SetFlags(flags);
 
 			Application.Context.StartActivity(intent);
@@ -42,10 +38,6 @@ Task<bool> PlatformOpenAsync(OpenFileRequest request)
 
 			var chooserIntent = Intent.CreateChooser(intent, request.Title ?? string.Empty);
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
-#endif
 			chooserIntent.SetFlags(flags);
 
 			Application.Context.StartActivity(chooserIntent);

diff --git a/src/Essentials/src/Map/Map.android.cs b/src/Essentials/src/Map/Map.android.cs
@@ -126,10 +126,6 @@ Intent ResolveMapIntent(string uri)
 		{
 			var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri));
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
-#endif
 			intent.SetFlags(flags);
 
 			return intent;

diff --git a/src/Essentials/src/PhoneDialer/PhoneDialer.android.cs b/src/Essentials/src/PhoneDialer/PhoneDialer.android.cs
@@ -37,8 +37,6 @@ public void Open(string number)
 			var dialIntent = ResolveDialIntent(phoneNumber);
 
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
 			dialIntent.SetFlags(flags);
 
 			Application.Context.StartActivity(dialIntent);

diff --git a/src/Essentials/src/Sms/Sms.android.cs b/src/Essentials/src/Sms/Sms.android.cs
@@ -23,8 +23,6 @@ Task PlatformComposeAsync(SmsMessage message)
 			var intent = CreateIntent(message?.Body, message?.Recipients);
 
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-			if (OperatingSystem.IsAndroidVersionAtLeast(24))
-				flags |= ActivityFlags.LaunchAdjacent;
 			intent.SetFlags(flags);
 
 			Application.Context.StartActivity(intent);