From 317bcdab674efa314e09c01d4a13be1a931874a8 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Mon, 23 Jan 2023 10:53:56 -1000
Subject: [PATCH 1/3] [Mono.Android] Fix
 WindowManagerLayoutParams.SystemUiVisibility enumification.

---
 src/Mono.Android/Android.Telecom/InCallService.cs |  2 +-
 .../Android.Views/WindowManagerLayoutParams.cs    | 15 +++++++++++++++
 src/Mono.Android/Mono.Android.csproj              |  1 +
 src/Mono.Android/metadata                         |  3 +++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs

diff --git a/src/Mono.Android/Android.Telecom/InCallService.cs b/src/Mono.Android/Android.Telecom/InCallService.cs
index cefede41963..caf036c557e 100644
--- a/src/Mono.Android/Android.Telecom/InCallService.cs
+++ b/src/Mono.Android/Android.Telecom/InCallService.cs
@@ -6,7 +6,7 @@ namespace Android.Telecom
 	public abstract partial class InCallService : Android.App.Service
 	{
 #if ANDROID_23
-		[Obsolete ("Incorrect enum parameter, use the overload that takes a CallAudioRoute paramter instead.")]
+		[Obsolete ("Incorrect enum parameter, use the overload that takes a CallAudioRoute parameter instead.")]
 		[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android23.0")]
 		public void SetAudioRoute ([global::Android.Runtime.GeneratedEnum] Android.Telecom.VideoQuality route)
 		{
diff --git a/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs b/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs
new file mode 100644
index 00000000000..aa0df4e2b78
--- /dev/null
+++ b/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Android.Views
+{
+	partial class WindowManagerLayoutParams
+	{
+#if NET
+		[global::System.Runtime.Versioning.ObsoletedOSPlatform ("android30.0", "These flags are deprecated. Use WindowInsetsController instead.")]
+		public SystemUiFlags SystemUiFlags {
+			get => (SystemUiFlags) SystemUiVisibility;
+			set => SystemUiVisibility = (Android.Views.StatusBarVisibility) value;
+		}
+#endif
+	}
+}
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 26ca98ae8b9..aa085c17e26 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -127,6 +127,7 @@
     <Compile Include="Android.Runtime\DynamicMethodNameCounter.cs" />
     <Compile Include="Android.Runtime\IJavaObjectValueMarshaler.cs" />
     <Compile Include="Android.Telecom\InCallService.cs" />
+    <Compile Include="Android.Views\WindowManagerLayoutParams.cs" />
   </ItemGroup>
 
   <Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index f98d5a19c42..7a29332167b 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1715,6 +1715,9 @@
   <remove-node api-since="33" path="/api/package[@name='java.util.concurrent']/class[@name='TimeUnit']/method[@name='of' and count(parameter)=1 and parameter[1][@type='java.time.temporal.ChronoUnit']]" />
   <remove-node api-since="33" path="/api/package[@name='java.util.concurrent']/class[@name='TimeUnit']/method[@name='toChronoUnit' and count(parameter)=0]" />
 
+  <attr path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated">This property has an incorrect enumeration type. Use the SystemUiFlags property instead.</attr>
+  <attr path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated-since">0</attr>
+
   <!--
     ***********************************************************************
     THE FOLLOWING LINES MUST BE CREATED FOR ANY NEW PLATFORM THAT IS ADDED.

From 52b082c74266c3bde95611b3518164942a49b196 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Thu, 26 Jan 2023 06:50:54 -1000
Subject: [PATCH 2/3] Guard changes to API-34+.

---
 src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs | 2 +-
 src/Mono.Android/metadata                                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs b/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs
index aa0df4e2b78..cd1882a2998 100644
--- a/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs
+++ b/src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs
@@ -4,7 +4,7 @@ namespace Android.Views
 {
 	partial class WindowManagerLayoutParams
 	{
-#if NET
+#if NET && ANDROID_34
 		[global::System.Runtime.Versioning.ObsoletedOSPlatform ("android30.0", "These flags are deprecated. Use WindowInsetsController instead.")]
 		public SystemUiFlags SystemUiFlags {
 			get => (SystemUiFlags) SystemUiVisibility;
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index 7a29332167b..5329ef37056 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1715,8 +1715,8 @@
   <remove-node api-since="33" path="/api/package[@name='java.util.concurrent']/class[@name='TimeUnit']/method[@name='of' and count(parameter)=1 and parameter[1][@type='java.time.temporal.ChronoUnit']]" />
   <remove-node api-since="33" path="/api/package[@name='java.util.concurrent']/class[@name='TimeUnit']/method[@name='toChronoUnit' and count(parameter)=0]" />
 
-  <attr path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated">This property has an incorrect enumeration type. Use the SystemUiFlags property instead.</attr>
-  <attr path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated-since">0</attr>
+  <attr api-since="34" path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated">This property has an incorrect enumeration type. Use the SystemUiFlags property instead.</attr>
+  <attr api-since="34" path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated-since">0</attr>
 
   <!--
     ***********************************************************************

From b08031bca1ffc9aa7e0ccbb146edee8af9eb8d0e Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Thu, 26 Jan 2023 10:42:17 -1000
Subject: [PATCH 3/3] Apply fix to Android.Views.View as well.

---
 src/Mono.Android/Android.Views/View.cs | 8 ++++++++
 src/Mono.Android/metadata              | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/Mono.Android/Android.Views/View.cs b/src/Mono.Android/Android.Views/View.cs
index 707f7a1e389..41ed43e6982 100644
--- a/src/Mono.Android/Android.Views/View.cs
+++ b/src/Mono.Android/Android.Views/View.cs
@@ -90,5 +90,13 @@ public bool FitsSystemWindows ()
 			return InvokeFitsSystemWindows ();
 		}
 #endif
+
+#if NET && ANDROID_34
+		[global::System.Runtime.Versioning.ObsoletedOSPlatform ("android30.0", "These flags are deprecated. Use WindowInsetsController instead.")]
+		public SystemUiFlags SystemUiFlags {
+			get => (SystemUiFlags) SystemUiVisibility;
+			set => SystemUiVisibility = (Android.Views.StatusBarVisibility) value;
+		}
+#endif
 	}
 }
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index 5329ef37056..6e6aa5f145c 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1717,6 +1717,10 @@
 
   <attr api-since="34" path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated">This property has an incorrect enumeration type. Use the SystemUiFlags property instead.</attr>
   <attr api-since="34" path="/api/package[@name='android.view']/class[@name='WindowManager.LayoutParams']/field[@name='systemUiVisibility']" name="deprecated-since">0</attr>
+  <attr api-since="34" path="/api/package[@name='android.view']/class[@name='View']/method[@name='getSystemUiVisibility']" name="deprecated">This property has an incorrect enumeration type. Use the SystemUiFlags property instead.</attr>
+  <attr api-since="34" path="/api/package[@name='android.view']/class[@name='View']/method[@name='getSystemUiVisibility']" name="deprecated-since">0</attr>
+  <attr api-since="34" path="/api/package[@name='android.view']/class[@name='View']/method[@name='setSystemUiVisibility']" name="deprecated">This property has an incorrect enumeration type. Use the SystemUiFlags property instead.</attr>
+  <attr api-since="34" path="/api/package[@name='android.view']/class[@name='View']/method[@name='setSystemUiVisibility']" name="deprecated-since">0</attr>
 
   <!--
     ***********************************************************************