From 9b91a7b0ad301f46bc3a18c2c10d8ec60a57e116 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 17 Jun 2025 10:39:54 +0000
Subject: [PATCH] Revert "Fixes Setting BackgroundColor to null does not
 actually changes BackgroundColor #22914 (#22917)"

This reverts commit 19402d377cb5bdb6588dca6810171de08a8405d9.
---
 .../TestCases.HostApp/Issues/Issue22914.xaml  | 26 ----------------
 .../Issues/Issue22914.xaml.cs                 | 26 ----------------
 .../Tests/Issues/Issue22914.cs                | 31 -------------------
 .../src/Platform/Android/ViewExtensions.cs    |  2 +-
 src/Core/src/Platform/iOS/ViewExtensions.cs   |  2 +-
 5 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml
 delete mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml.cs
 delete mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22914.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml
deleted file mode 100644
index d9b26c4ca802..000000000000
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage
-    x:Class="Maui.Controls.Sample.Issues.Issue22914"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-    <VerticalStackLayout x:Name="VerticalStackLayout1" BackgroundColor="Orange">
-
-
-        <ContentView x:Name="ContentView1" BackgroundColor="Gray">
-            <Label Text="You should be able to read after tapping the button" TextColor="Gray" />
-        </ContentView>
-
-        <Label
-            x:Name="Label1"
-            BackgroundColor="Green"
-            HeightRequest="100"
-            Text="Sample label" />
-
-        <Button
-            x:Name="Tap1Button"
-            AutomationId="Tap1Button"
-            BackgroundColor="Red"
-            Text="Reset background color" />
-
-    </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml.cs
deleted file mode 100644
index 782cb2f650fd..000000000000
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue22914.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Xaml;
-
-namespace Maui.Controls.Sample.Issues
-{
-	[XamlCompilation(XamlCompilationOptions.Compile)]
-	[Issue(IssueTracker.Github, 22914, "Setting BackgroundColor to null does not actually changes BackgroundColor", PlatformAffected.iOS | PlatformAffected.Android)]
-	public partial class Issue22914 : ContentPage
-	{
-		public Issue22914()
-		{
-			InitializeComponent();
-
-			var tapCommand = new Command(buttonTapped);
-			this.Tap1Button.Command = tapCommand;
-		}
-
-		void buttonTapped()
-		{
-			this.Tap1Button.BackgroundColor = null;
-			this.ContentView1.BackgroundColor = null;
-			this.Label1.BackgroundColor = null;
-			this.VerticalStackLayout1.BackgroundColor = null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22914.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22914.cs
deleted file mode 100644
index 351e8e9df174..000000000000
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22914.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Drawing;
-using NUnit.Framework;
-using NUnit.Framework.Legacy;
-using UITest.Appium;
-using UITest.Core;
-
-namespace Microsoft.Maui.TestCases.Tests.Issues
-{
-	public class Issue22914 : _IssuesUITest
-	{
-		const string ButtonId = "Tap1Button";
-
-		readonly string[] _expectedNullBackgroundColorIds = [ButtonId, "ContentView1", "Label1", "VerticalStackLayout1"];
-
-		public Issue22914(TestDevice device) : base(device)
-		{
-		}
-
-		public override string Issue => "Setting BackgroundColor to null does not actually changes BackgroundColor";
-
-		[Test]
-		[Category(UITestCategories.ViewBaseTests)]
-		public void UpdateBackgroundColorToNull()
-		{
-			var tapAreaResult = App.WaitForElement(ButtonId, $"Timed out waiting for {ButtonId}");
-			tapAreaResult.Tap();
-
-			VerifyScreenshot("Issue22914Test");
-		}
-	}
-}
diff --git a/src/Core/src/Platform/Android/ViewExtensions.cs b/src/Core/src/Platform/Android/ViewExtensions.cs
index 26dda814e2e0..c93b0b363db6 100644
--- a/src/Core/src/Platform/Android/ViewExtensions.cs
+++ b/src/Core/src/Platform/Android/ViewExtensions.cs
@@ -300,7 +300,7 @@ internal static void UpdateBackground(this AView platformView, Paint? background
 						platformView.Background = drawable;
 				}
 			}
-			else if (platformView is not null)
+			else if (platformView is LayoutViewGroup)
 			{
 				platformView.Background = null;
 			}
diff --git a/src/Core/src/Platform/iOS/ViewExtensions.cs b/src/Core/src/Platform/iOS/ViewExtensions.cs
index daa0a8cdcdcd..5ae1fe1f275c 100644
--- a/src/Core/src/Platform/iOS/ViewExtensions.cs
+++ b/src/Core/src/Platform/iOS/ViewExtensions.cs
@@ -77,7 +77,7 @@ public static void UpdateBackground(this UIView platformView, Paint? paint, IBut
 
 			if (paint.IsNullOrEmpty())
 			{
-				if (platformView is not null)
+				if (platformView is LayoutView)
 					platformView.BackgroundColor = null;
 				else
 					return;