Merge pull request #2058 from xamarin/gh-2023

Remove launch adjacent Fixes #2023
xamarin · Dec 1, 2022 · 77ad3c9 · 77ad3c9
2 parents df5ddea + 55259a1
commit 77ad3c9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 28 deletions.
diff --git a/Xamarin.Essentials/AppInfo/AppInfo.android.cs b/Xamarin.Essentials/AppInfo/AppInfo.android.cs
@@ -59,10 +59,6 @@ static void PlatformShowSettingsUI()
 
             var flags = ActivityFlags.NewTask | ActivityFlags.NoHistory | ActivityFlags.ExcludeFromRecents;
 
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
             settingsIntent.SetFlags(flags);
 
             context.StartActivity(settingsIntent);

diff --git a/Xamarin.Essentials/Email/Email.android.cs b/Xamarin.Essentials/Email/Email.android.cs
@@ -21,10 +21,7 @@ static Task PlatformComposeAsync(EmailMessage message)
         {
             var intent = CreateIntent(message);
             var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
+
             intent.SetFlags(flags);
 
             Platform.AppContext.StartActivity(intent);

diff --git a/Xamarin.Essentials/Launcher/Launcher.android.cs b/Xamarin.Essentials/Launcher/Launcher.android.cs
@@ -26,10 +26,7 @@ static Task PlatformOpenAsync(Uri uri)
         {
             var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri.OriginalString));
             var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
+
             intent.SetFlags(flags);
 
             Platform.AppContext.StartActivity(intent);
@@ -46,10 +43,7 @@ static Task PlatformOpenAsync(OpenFileRequest request)
 
             var chooserIntent = Intent.CreateChooser(intent, request.Title ?? string.Empty);
             var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
+
             chooserIntent.SetFlags(flags);
 
             Platform.AppContext.StartActivity(chooserIntent);

diff --git a/Xamarin.Essentials/Map/Map.android.cs b/Xamarin.Essentials/Map/Map.android.cs
@@ -62,10 +62,7 @@ static void StartIntent(string uri)
         {
             var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri));
             var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
+
             intent.SetFlags(flags);
 
             Platform.AppContext.StartActivity(intent);

diff --git a/Xamarin.Essentials/PhoneDialer/PhoneDialer.android.cs b/Xamarin.Essentials/PhoneDialer/PhoneDialer.android.cs
@@ -47,10 +47,7 @@ static void PlatformOpen(string number)
             var dialIntent = ResolveDialIntent(phoneNumber);
 
             var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
+
             dialIntent.SetFlags(flags);
 
             Platform.AppContext.StartActivity(dialIntent);

diff --git a/Xamarin.Essentials/Sms/Sms.android.cs b/Xamarin.Essentials/Sms/Sms.android.cs
@@ -21,10 +21,7 @@ static Task PlatformComposeAsync(SmsMessage message)
             var intent = CreateIntent(message?.Body, message?.Recipients);
 
             var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
-#if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
-#endif
+
             intent.SetFlags(flags);
 
             Platform.AppContext.StartActivity(intent);