Skip to content
This repository was archived by the owner on May 15, 2024. It is now read-only.

Commit 77ad3c9

Browse files
authored
Merge pull request #2058 from xamarin/gh-2023
Remove launch adjacent Fixes #2023
2 parents df5ddea + 55259a1 commit 77ad3c9

File tree

6 files changed

+6
-28
lines changed

6 files changed

+6
-28
lines changed

Xamarin.Essentials/AppInfo/AppInfo.android.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ static void PlatformShowSettingsUI()
5959

6060
var flags = ActivityFlags.NewTask | ActivityFlags.NoHistory | ActivityFlags.ExcludeFromRecents;
6161

62-
#if __ANDROID_24__
63-
if (Platform.HasApiLevelN)
64-
flags |= ActivityFlags.LaunchAdjacent;
65-
#endif
6662
settingsIntent.SetFlags(flags);
6763

6864
context.StartActivity(settingsIntent);

Xamarin.Essentials/Email/Email.android.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ static Task PlatformComposeAsync(EmailMessage message)
2121
{
2222
var intent = CreateIntent(message);
2323
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
24-
#if __ANDROID_24__
25-
if (Platform.HasApiLevelN)
26-
flags |= ActivityFlags.LaunchAdjacent;
27-
#endif
24+
2825
intent.SetFlags(flags);
2926

3027
Platform.AppContext.StartActivity(intent);

Xamarin.Essentials/Launcher/Launcher.android.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ static Task PlatformOpenAsync(Uri uri)
2626
{
2727
var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri.OriginalString));
2828
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
29-
#if __ANDROID_24__
30-
if (Platform.HasApiLevelN)
31-
flags |= ActivityFlags.LaunchAdjacent;
32-
#endif
29+
3330
intent.SetFlags(flags);
3431

3532
Platform.AppContext.StartActivity(intent);
@@ -46,10 +43,7 @@ static Task PlatformOpenAsync(OpenFileRequest request)
4643

4744
var chooserIntent = Intent.CreateChooser(intent, request.Title ?? string.Empty);
4845
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
49-
#if __ANDROID_24__
50-
if (Platform.HasApiLevelN)
51-
flags |= ActivityFlags.LaunchAdjacent;
52-
#endif
46+
5347
chooserIntent.SetFlags(flags);
5448

5549
Platform.AppContext.StartActivity(chooserIntent);

Xamarin.Essentials/Map/Map.android.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ static void StartIntent(string uri)
6262
{
6363
var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri));
6464
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
65-
#if __ANDROID_24__
66-
if (Platform.HasApiLevelN)
67-
flags |= ActivityFlags.LaunchAdjacent;
68-
#endif
65+
6966
intent.SetFlags(flags);
7067

7168
Platform.AppContext.StartActivity(intent);

Xamarin.Essentials/PhoneDialer/PhoneDialer.android.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ static void PlatformOpen(string number)
4747
var dialIntent = ResolveDialIntent(phoneNumber);
4848

4949
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
50-
#if __ANDROID_24__
51-
if (Platform.HasApiLevelN)
52-
flags |= ActivityFlags.LaunchAdjacent;
53-
#endif
50+
5451
dialIntent.SetFlags(flags);
5552

5653
Platform.AppContext.StartActivity(dialIntent);

Xamarin.Essentials/Sms/Sms.android.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ static Task PlatformComposeAsync(SmsMessage message)
2121
var intent = CreateIntent(message?.Body, message?.Recipients);
2222

2323
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
24-
#if __ANDROID_24__
25-
if (Platform.HasApiLevelN)
26-
flags |= ActivityFlags.LaunchAdjacent;
27-
#endif
24+
2825
intent.SetFlags(flags);
2926

3027
Platform.AppContext.StartActivity(intent);

0 commit comments

Comments
 (0)