diff --git a/api/Avalonia.Android.nupkg.xml b/api/Avalonia.Android.nupkg.xml index 6ffd08efe1..98f8c40204 100644 --- a/api/Avalonia.Android.nupkg.xml +++ b/api/Avalonia.Android.nupkg.xml @@ -7,6 +7,18 @@ baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll + + CP0002 + M:Avalonia.Android.AvaloniaMainActivity.CreateAppBuilder + baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll + current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll + + + CP0002 + M:Avalonia.Android.AvaloniaMainActivity.CustomizeAppBuilder(Avalonia.AppBuilder) + baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll + current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll + CP0008 T:Avalonia.Android.AvaloniaActivity diff --git a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs index 46514cd05f..a5532c3cee 100644 --- a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs +++ b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs @@ -44,7 +44,4 @@ public class AvaloniaMainActivity : AvaloniaActivity activatableLifetime.CurrentMainActivity = null; } } - - protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure().UseAndroid(); - protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder; } diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs index 42f0877eca..b11d35d1ef 100644 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs +++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs @@ -8,7 +8,6 @@ using Android.Runtime; using Android.Views; using AndroidX.AppCompat.App; using Avalonia.Android.Platform.Input; -using Avalonia.Android.Platform.Specific; using Avalonia.Android.Platform.Specific.Helpers; using Avalonia.Android.Platform.Storage; using Avalonia.Controls; @@ -254,7 +253,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform public void SetTransparencyLevelHint(IReadOnlyList transparencyLevels) { - if (_view.Context is not AvaloniaMainActivity activity) + if (_view.Context is not AvaloniaActivity activity) return; foreach (var level in transparencyLevels) @@ -366,7 +365,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform return false; } - private static void SetBlurBehind(AvaloniaMainActivity activity, int radius) + private static void SetBlurBehind(AvaloniaActivity activity, int radius) { if (radius == 0) activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind);