From 9182d58290f133ebcd0f071dcd36240ee8141d83 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 5 May 2025 17:03:26 +0200
Subject: [PATCH 01/11] version bumped

---
 eng/AndroidX.targets                          | 26 +++++++++----------
 eng/Versions.props                            |  8 +++---
 .../src/Compatibility.Android.AppLinks.csproj |  4 +--
 .../Android/Compatibility.Maps.Android.csproj |  6 ++---
 .../Compatibility.Material.Android.csproj     |  4 +--
 .../Foldable/src/Controls.Foldable.csproj     |  6 ++---
 src/Core/src/Core.csproj                      | 14 +++++-----
 src/Essentials/src/Essentials.csproj          |  4 +--
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index f8d36b9704a4..773837d64936 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -2,47 +2,47 @@
   <ItemGroup>
     <PackageReference
         Update="Xamarin.AndroidX.AppCompat.AppCompatResources"
-        Version="1.7.0.5"
+        Version="1.7.0.6"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Browser"
-        Version="1.8.0.8"
+        Version="1.8.0.9"
     />
     <PackageReference
         Update="Xamarin.AndroidX.SwipeRefreshLayout"
-        Version="1.1.0.24"
+        Version="1.1.0.27"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Lifecycle.LiveData"
-        Version="2.8.7.2"
+        Version="2.8.7.3"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.UI"
-        Version="2.8.5.1"
+        Version="2.8.9.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Fragment"
-        Version="2.8.5.1"
+        Version="2.8.9.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Runtime"
-        Version="2.8.5.1"
+        Version="2.8.9.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Navigation.Common"
-        Version="2.8.5.1"
+        Version="2.8.9.1"
     />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
-        Version="1.7.0.8"
+        Version="1.7.0.9"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Palette"
-        Version="1.0.0.31"
+        Version="1.0.0.32"
     />
     <PackageReference
         Update="Xamarin.AndroidX.RecyclerView"
-        Version="1.3.2.10"
+        Version="1.4.0.1"
     />
     <PackageReference
         Update="Xamarin.Build.Download"
@@ -50,7 +50,7 @@
     />
     <PackageReference
         Update="Xamarin.Google.Android.Material"
-        Version="1.12.0.2"
+        Version="1.12.0.3"
     />
     <PackageReference
         Update="Xamarin.AndroidX.Migration"
@@ -59,7 +59,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.Window.WindowJava"
-        Version="1.3.0.5"
+        Version="1.3.0.6"
     />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index dd2f9ef01391..3b2887a9e3eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -109,11 +109,11 @@
     <MicrosoftBuildUtilitiesCorePackageVersion>17.9.5</MicrosoftBuildUtilitiesCorePackageVersion>
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
-    <_XamarinAndroidGlideVersion>4.16.0.11</_XamarinAndroidGlideVersion>
-    <_XamarinAndroidXSecurityVersion>1.1.0.2-alpha06</_XamarinAndroidXSecurityVersion>
-    <_XamarinGoogleCryptoTinkAndroidVersion>1.16.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
+    <_XamarinAndroidGlideVersion>4.16.0.12</_XamarinAndroidGlideVersion>
+    <_XamarinAndroidXSecurityVersion>1.1.0.3-alpha07</_XamarinAndroidXSecurityVersion>
+    <_XamarinGoogleCryptoTinkAndroidVersion>1.17.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
     <!-- Android Maps -->
-    <XamarinGooglePlayServicesMaps>119.0.0.4</XamarinGooglePlayServicesMaps>
+    <XamarinGooglePlayServicesMaps>119.2.0.1</XamarinGooglePlayServicesMaps>
     <!--
       SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
        - NuGet versions below
diff --git a/src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj b/src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj
index 0a0bc0b9a7f5..a167595dacca 100644
--- a/src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj
+++ b/src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.23" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
+    <PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.24" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj b/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
index 639f45c23e9c..0696b14f1c2c 100644
--- a/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
+++ b/src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.0.0.4" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.3" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.2.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj b/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
index 7bc1f725bc7f..ab1f1aaf3e8d 100644
--- a/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
+++ b/src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
@@ -15,8 +15,8 @@
     <AndroidResource Include="Resources\**\*" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
diff --git a/src/Controls/Foldable/src/Controls.Foldable.csproj b/src/Controls/Foldable/src/Controls.Foldable.csproj
index fd951509b9e5..6e3894716630 100644
--- a/src/Controls/Foldable/src/Controls.Foldable.csproj
+++ b/src/Controls/Foldable/src/Controls.Foldable.csproj
@@ -34,11 +34,11 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
   <ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.3" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
-    <PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.5" />
+    <PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.6" />
   </ItemGroup>
 
   <Import Project="$(MauiSrcDirectory)Workload\Shared\LibraryPacks.targets" />
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index fee54ef3c61f..aa7d286a933b 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -47,13 +47,13 @@
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
     <AndroidGradleProject Include="../AndroidNative/build.gradle" ModuleName="maui" />
     <PackageReference Include="Xamarin.Android.Glide" Version="$(_XamarinAndroidGlideVersion)" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
-    <PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.26" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.5.1" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.5.1" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.5.1" />
-    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.5.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.27" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.9.1" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.9.1" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.9.1" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.9.1" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
     <PackageReference Include="Tizen.UIExtensions.NUI" />
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index e033f2100653..3dc2cd3778a4 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -44,9 +44,9 @@
     <Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Include="**\*.android.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <AndroidResource Include="Resources\xml\*.xml" />
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.8" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.9" />
     <PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.2-alpha06" />
-    <PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.16.0.1" />
+    <PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.17.0.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
     <Compile Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />

From ab4bda41345af318374839e9664573bcc6e2d6b9 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 5 May 2025 17:03:51 +0200
Subject: [PATCH 02/11] nullability fixes

---
 .../src/Core/Platform/Android/ControlsAccessibilityDelegate.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Platform/Android/ControlsAccessibilityDelegate.cs b/src/Controls/src/Core/Platform/Android/ControlsAccessibilityDelegate.cs
index d73b8dae6a17..c4e4bd381719 100644
--- a/src/Controls/src/Core/Platform/Android/ControlsAccessibilityDelegate.cs
+++ b/src/Controls/src/Core/Platform/Android/ControlsAccessibilityDelegate.cs
@@ -15,7 +15,7 @@ public ControlsAccessibilityDelegate(AccessibilityDelegateCompat? originalDelega
 			Handler = viewHandler;
 		}
 
-		public override void OnInitializeAccessibilityNodeInfo(PlatformView host, AccessibilityNodeInfoCompat info)
+		public override void OnInitializeAccessibilityNodeInfo(PlatformView? host, AccessibilityNodeInfoCompat? info)
 		{
 			base.OnInitializeAccessibilityNodeInfo(host, info);
 

From d3bac5d43859e16100a6438a4f41fed7bfc93a72 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 5 May 2025 17:04:22 +0200
Subject: [PATCH 03/11] nullability fixes

---
 .../AccessibilityDelegateCompatWrapper.cs      | 18 +++++++++---------
 .../Android/MauiAccessibilityDelegateCompat.cs |  2 +-
 .../src/Platform/Android/MauiMaterialButton.cs |  2 +-
 .../src/Platform/Android/MauiScrollView.cs     |  2 +-
 .../src/SecureStorage/SecureStorage.android.cs |  2 ++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Core/src/Platform/Android/AccessibilityDelegateCompatWrapper.cs b/src/Core/src/Platform/Android/AccessibilityDelegateCompatWrapper.cs
index a08d32ffc4c0..90c80e7b4b65 100644
--- a/src/Core/src/Platform/Android/AccessibilityDelegateCompatWrapper.cs
+++ b/src/Core/src/Platform/Android/AccessibilityDelegateCompatWrapper.cs
@@ -31,47 +31,47 @@ public AccessibilityDelegateCompatWrapper(AccessibilityDelegateCompat? originalD
 			_originalDelegate = originalDelegate ?? BlankDelegate;
 		}
 
-		public override void OnInitializeAccessibilityNodeInfo(PlatformView host, AccessibilityNodeInfoCompat info)
+		public override void OnInitializeAccessibilityNodeInfo(PlatformView? host, AccessibilityNodeInfoCompat? info)
 		{
 			_originalDelegate.OnInitializeAccessibilityNodeInfo(host, info);
 		}
 
-		public override void SendAccessibilityEvent(PlatformView host, int eventType)
+		public override void SendAccessibilityEvent(PlatformView? host, int eventType)
 		{
 			_originalDelegate.SendAccessibilityEvent(host, eventType);
 		}
 
-		public override void SendAccessibilityEventUnchecked(PlatformView host, AccessibilityEvent e)
+		public override void SendAccessibilityEventUnchecked(PlatformView? host, AccessibilityEvent? e)
 		{
 			_originalDelegate.SendAccessibilityEventUnchecked(host, e);
 		}
 
-		public override bool DispatchPopulateAccessibilityEvent(PlatformView host, AccessibilityEvent e)
+		public override bool DispatchPopulateAccessibilityEvent(PlatformView? host, AccessibilityEvent? e)
 		{
 			return _originalDelegate.DispatchPopulateAccessibilityEvent(host, e);
 		}
 
-		public override void OnPopulateAccessibilityEvent(PlatformView host, AccessibilityEvent e)
+		public override void OnPopulateAccessibilityEvent(PlatformView? host, AccessibilityEvent? e)
 		{
 			_originalDelegate.OnPopulateAccessibilityEvent(host, e);
 		}
 
-		public override void OnInitializeAccessibilityEvent(PlatformView host, AccessibilityEvent e)
+		public override void OnInitializeAccessibilityEvent(PlatformView? host, AccessibilityEvent? e)
 		{
 			_originalDelegate.OnInitializeAccessibilityEvent(host, e);
 		}
 
-		public override bool OnRequestSendAccessibilityEvent(Android.Views.ViewGroup host, PlatformView child, AccessibilityEvent e)
+		public override bool OnRequestSendAccessibilityEvent(Android.Views.ViewGroup? host, PlatformView? child, AccessibilityEvent? e)
 		{
 			return _originalDelegate.OnRequestSendAccessibilityEvent(host, child, e);
 		}
 
-		public override bool PerformAccessibilityAction(PlatformView host, int action, Bundle? args)
+		public override bool PerformAccessibilityAction(PlatformView? host, int action, Bundle? args)
 		{
 			return _originalDelegate.PerformAccessibilityAction(host, action, args);
 		}
 
-		public override AccessibilityNodeProviderCompat? GetAccessibilityNodeProvider(PlatformView host)
+		public override AccessibilityNodeProviderCompat? GetAccessibilityNodeProvider(PlatformView? host)
 		{
 			return _originalDelegate.GetAccessibilityNodeProvider(host);
 		}
diff --git a/src/Core/src/Platform/Android/MauiAccessibilityDelegateCompat.cs b/src/Core/src/Platform/Android/MauiAccessibilityDelegateCompat.cs
index f1a651885741..c4f402bf1e91 100644
--- a/src/Core/src/Platform/Android/MauiAccessibilityDelegateCompat.cs
+++ b/src/Core/src/Platform/Android/MauiAccessibilityDelegateCompat.cs
@@ -20,7 +20,7 @@ public MauiAccessibilityDelegateCompat(AccessibilityDelegateCompat? originalDele
 		{
 		}
 
-		public override void OnInitializeAccessibilityNodeInfo(PlatformView host, AccessibilityNodeInfoCompat info)
+		public override void OnInitializeAccessibilityNodeInfo(PlatformView? host, AccessibilityNodeInfoCompat? info)
 		{
 			base.OnInitializeAccessibilityNodeInfo(host, info);
 
diff --git a/src/Core/src/Platform/Android/MauiMaterialButton.cs b/src/Core/src/Platform/Android/MauiMaterialButton.cs
index d6a548b51acb..2a1144a702ee 100644
--- a/src/Core/src/Platform/Android/MauiMaterialButton.cs
+++ b/src/Core/src/Platform/Android/MauiMaterialButton.cs
@@ -85,7 +85,7 @@ protected override void OnLayout(bool changed, int left, int top, int right, int
 #pragma warning disable CS0618 // Type or member is obsolete
 				var icons = TextViewCompat.GetCompoundDrawablesRelative(this);
 #pragma warning restore CS0618 // Type or member is obsolete
-				if (icons[1] is { } icon)
+				if (icons?[1] is { } icon)
 				{
 #pragma warning disable CS0618 // Type or member is obsolete
 					TextViewCompat.SetCompoundDrawablesRelative(this, null, null, null, icon);
diff --git a/src/Core/src/Platform/Android/MauiScrollView.cs b/src/Core/src/Platform/Android/MauiScrollView.cs
index 51626a84f3d9..3be88c06db46 100644
--- a/src/Core/src/Platform/Android/MauiScrollView.cs
+++ b/src/Core/src/Platform/Android/MauiScrollView.cs
@@ -317,7 +317,7 @@ void SmoothScrollTo(int x, int y, Action finished)
 		}
 
 #pragma warning disable CA1822 // DO NOT REMOVE! Needed because dotnet format will else try to make this static and break things
-		void IOnScrollChangeListener.OnScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY)
+		void IOnScrollChangeListener.OnScrollChange(NestedScrollView? v, int scrollX, int scrollY, int oldScrollX, int oldScrollY)
 #pragma warning restore CA1822
 		{
 			OnScrollChanged(scrollX, scrollY, oldScrollX, oldScrollY);
diff --git a/src/Essentials/src/SecureStorage/SecureStorage.android.cs b/src/Essentials/src/SecureStorage/SecureStorage.android.cs
index 4524ad384d5d..3e20b6281985 100644
--- a/src/Essentials/src/SecureStorage/SecureStorage.android.cs
+++ b/src/Essentials/src/SecureStorage/SecureStorage.android.cs
@@ -127,6 +127,7 @@ ISharedPreferences CreateEncryptedSharedPreferences()
 		{
 			var context = Application.Context;
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			var prefsMainKey = new MasterKey.Builder(context, Alias)
 				.SetKeyScheme(MasterKey.KeyScheme.Aes256Gcm)
 				.Build();
@@ -137,6 +138,7 @@ ISharedPreferences CreateEncryptedSharedPreferences()
 				prefsMainKey,
 				EncryptedSharedPreferences.PrefKeyEncryptionScheme.Aes256Siv,
 				EncryptedSharedPreferences.PrefValueEncryptionScheme.Aes256Gcm);
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
 }

From 46c6c7c5d9426c7ee5d2fae9646f3bf95cf3073d Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 5 May 2025 17:04:42 +0200
Subject: [PATCH 04/11] Public API Shipped after nullability fixes

---
 .../src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index ce68bc5c9d50..dd79d206eacb 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -7661,7 +7661,7 @@ override Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter.G
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.Dispose(bool disposing) -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.OnDestroy() -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellToolbarTracker.Dispose(bool disposing) -> void
-override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
+override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
 override Microsoft.Maui.Controls.Platform.GenericAnimatorListener.JavaFinalize() -> void
 override Microsoft.Maui.Controls.RadialGradientBrush.IsEmpty.get -> bool
 override Microsoft.Maui.Controls.RadioButton.ChangeVisualState() -> void

From 7391e2b10249dbc3140eab4043ed54b9a173b436 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 5 May 2025 17:04:48 +0200
Subject: [PATCH 05/11] Public API Shipped after nullability fixes

---
 .../net-android/PublicAPI.Shipped.txt         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
index 924f0edb64ef..efde3f86c955 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -2286,15 +2286,15 @@ override Microsoft.Maui.MauiViewGroup.JniPeerMembers.get -> Java.Interop.JniPeer
 override Microsoft.Maui.MauiViewGroup.OnLayout(bool changed, int l, int t, int r, int b) -> void
 override Microsoft.Maui.MauiViewGroup.ThresholdClass.get -> nint
 override Microsoft.Maui.MauiViewGroup.ThresholdType.get -> System.Type!
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View! host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup! host, Android.Views.View! child, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View! host, int action, Android.OS.Bundle? args) -> bool
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View! host, int eventType) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View? host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup? host, Android.Views.View? child, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View? host, int action, Android.OS.Bundle? args) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View? host, int eventType) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
 override Microsoft.Maui.Platform.BorderDrawable.Dispose(bool disposing) -> void
 override Microsoft.Maui.Platform.BorderDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
 override Microsoft.Maui.Platform.BorderDrawable.OnDraw(Android.Graphics.Drawables.Shapes.Shape? shape, Android.Graphics.Canvas? canvas, Android.Graphics.Paint? paint) -> void
@@ -2307,7 +2307,7 @@ override Microsoft.Maui.Platform.LayoutViewGroup.OnTouchEvent(Android.Views.Moti
 override Microsoft.Maui.Platform.LocalizedDigitsKeyListener.FilterFormatted(Java.Lang.ICharSequence? source, int start, int end, Android.Text.ISpanned? dest, int dstart, int dend) -> Java.Lang.ICharSequence?
 override Microsoft.Maui.Platform.LocalizedDigitsKeyListener.GetAcceptedChars() -> char[]!
 override Microsoft.Maui.Platform.LocalizedDigitsKeyListener.InputType.get -> Android.Text.InputTypes
-override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
+override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
 override Microsoft.Maui.Platform.MauiMaterialButton.IconGravity.get -> int
 override Microsoft.Maui.Platform.MauiMaterialButton.IconGravity.set -> void
 override Microsoft.Maui.Platform.MauiMaterialButton.OnLayout(bool changed, int left, int top, int right, int bottom) -> void

From da23d0748a8ded62c31794df132a12c6151f67ad Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 5 May 2025 22:17:29 +0200
Subject: [PATCH 06/11] dereferencing fix

---
 .../tests/DeviceTests/Elements/Button/ButtonTests.Android.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
index c0a229238f06..4288c2d53821 100644
--- a/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs
@@ -95,7 +95,7 @@ await CreateHandlerAndAddToWindow(page, () =>
 #pragma warning disable CS0618 // Type or member is obsolete
 				var drawables = TextViewCompat.GetCompoundDrawablesRelative(platformButton);
 #pragma warning restore CS0618 // Type or member is obsolete
-				Assert.NotNull(drawables[matchingDrawableIndex]);
+				Assert.NotNull(drawables?[matchingDrawableIndex]);
 			});
 		}
 

From 75b59c0f6fc539f232bb8cd188f33305178350db Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Wed, 7 May 2025 12:29:18 +0200
Subject: [PATCH 07/11] fix according to review

---
 .../src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt        | 2 +-
 .../src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index dd79d206eacb..ce68bc5c9d50 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -7661,7 +7661,7 @@ override Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter.G
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.Dispose(bool disposing) -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.OnDestroy() -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellToolbarTracker.Dispose(bool disposing) -> void
-override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
+override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
 override Microsoft.Maui.Controls.Platform.GenericAnimatorListener.JavaFinalize() -> void
 override Microsoft.Maui.Controls.RadialGradientBrush.IsEmpty.get -> bool
 override Microsoft.Maui.Controls.RadioButton.ChangeVisualState() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 5b8f9021d63e..40d181cc0c55 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -83,6 +83,7 @@ Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
+override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.RenderProcessGoneDetail.get -> Android.Webkit.RenderProcessGoneDetail?
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.Sender.get -> Android.Views.View?

From c1f536249701c640edacad0d4ed1ed0267cbacfa Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Wed, 7 May 2025 16:23:23 +0200
Subject: [PATCH 08/11] another fix

---
 .../src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt        | 2 +-
 .../src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index ce68bc5c9d50..dd79d206eacb 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -7661,7 +7661,7 @@ override Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter.G
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.Dispose(bool disposing) -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.OnDestroy() -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellToolbarTracker.Dispose(bool disposing) -> void
-override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
+override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
 override Microsoft.Maui.Controls.Platform.GenericAnimatorListener.JavaFinalize() -> void
 override Microsoft.Maui.Controls.RadialGradientBrush.IsEmpty.get -> bool
 override Microsoft.Maui.Controls.RadioButton.ChangeVisualState() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 40d181cc0c55..4c4bd592e190 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -83,7 +83,7 @@ Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
-override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
+*REMOVED*override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.RenderProcessGoneDetail.get -> Android.Webkit.RenderProcessGoneDetail?
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.Sender.get -> Android.Views.View?

From bb2c970806bdada14a3c335ef58889f3217da8b1 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Thu, 8 May 2025 13:30:23 +0200
Subject: [PATCH 09/11] fixes Shipped/Unshiped

---
 .../src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt        | 2 +-
 .../src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index dd79d206eacb..ce68bc5c9d50 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -7661,7 +7661,7 @@ override Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter.G
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.Dispose(bool disposing) -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.OnDestroy() -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellToolbarTracker.Dispose(bool disposing) -> void
-override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
+override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
 override Microsoft.Maui.Controls.Platform.GenericAnimatorListener.JavaFinalize() -> void
 override Microsoft.Maui.Controls.RadialGradientBrush.IsEmpty.get -> bool
 override Microsoft.Maui.Controls.RadioButton.ChangeVisualState() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 4c4bd592e190..b0faa838339d 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -83,6 +83,7 @@ Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
 Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
+override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
 *REMOVED*override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs
 Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.RenderProcessGoneDetail.get -> Android.Webkit.RenderProcessGoneDetail?

From 13b814c88fa903ef7fa7ccb3be6820130968f13a Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Fri, 9 May 2025 14:04:26 +0200
Subject: [PATCH 10/11] fix according to review

---
 .../net-android/PublicAPI.Shipped.txt         | 18 ++++++++---------
 .../net-android/PublicAPI.Unshipped.txt       | 20 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
index efde3f86c955..0a4ecade3b88 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -2286,15 +2286,15 @@ override Microsoft.Maui.MauiViewGroup.JniPeerMembers.get -> Java.Interop.JniPeer
 override Microsoft.Maui.MauiViewGroup.OnLayout(bool changed, int l, int t, int r, int b) -> void
 override Microsoft.Maui.MauiViewGroup.ThresholdClass.get -> nint
 override Microsoft.Maui.MauiViewGroup.ThresholdType.get -> System.Type!
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View? host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup? host, Android.Views.View? child, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View? host, int action, Android.OS.Bundle? args) -> bool
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View? host, int eventType) -> void
-override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View! host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup! host, Android.Views.View! child, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View! host, int action, Android.OS.Bundle! args) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View! host, int eventType) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
 override Microsoft.Maui.Platform.BorderDrawable.Dispose(bool disposing) -> void
 override Microsoft.Maui.Platform.BorderDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
 override Microsoft.Maui.Platform.BorderDrawable.OnDraw(Android.Graphics.Drawables.Shapes.Shape? shape, Android.Graphics.Canvas? canvas, Android.Graphics.Paint? paint) -> void
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 9ddde8909b17..e64f45d1355d 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -91,4 +91,22 @@ override Microsoft.Maui.PlatformWrapperView.OnLayout(bool changed, int left, int
 virtual Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas! canvas, int viewWidth, int viewHeight) -> void
 *REMOVED*~override Microsoft.Maui.Platform.WrapperView.DrawShadow(Android.Graphics.Canvas canvas, int viewWidth, int viewHeight) -> void
 *REMOVED*abstract Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas! p0, int p1, int p2) -> void
-override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
\ No newline at end of file
+override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View! host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup! host, Android.Views.View! child, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View! host, int action, Android.OS.Bundle! args) -> bool
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View! host, int eventType) -> void
+*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View? host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup? host, Android.Views.View? child, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View? host, int action, Android.OS.Bundle? args) -> bool
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View? host, int eventType) -> void
+override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void

From 7323c2a2aa957ac2ecde014f73817466f2e0c139 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Mon, 12 May 2025 11:47:15 +0200
Subject: [PATCH 11/11] fixes according to review

---
 src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt   | 2 +-
 src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
index 0a4ecade3b88..132e1e883113 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -2307,7 +2307,7 @@ override Microsoft.Maui.Platform.LayoutViewGroup.OnTouchEvent(Android.Views.Moti
 override Microsoft.Maui.Platform.LocalizedDigitsKeyListener.FilterFormatted(Java.Lang.ICharSequence? source, int start, int end, Android.Text.ISpanned? dest, int dstart, int dend) -> Java.Lang.ICharSequence?
 override Microsoft.Maui.Platform.LocalizedDigitsKeyListener.GetAcceptedChars() -> char[]!
 override Microsoft.Maui.Platform.LocalizedDigitsKeyListener.InputType.get -> Android.Text.InputTypes
-override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
+override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
 override Microsoft.Maui.Platform.MauiMaterialButton.IconGravity.get -> int
 override Microsoft.Maui.Platform.MauiMaterialButton.IconGravity.set -> void
 override Microsoft.Maui.Platform.MauiMaterialButton.OnLayout(bool changed, int left, int top, int right, int bottom) -> void
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index e64f45d1355d..1f31201b7ee0 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -110,3 +110,5 @@ override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSen
 override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View? host, int action, Android.OS.Bundle? args) -> bool
 override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View? host, int eventType) -> void
 override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
+override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void