From 8950bcb099196c88b86d2602e6d79e70e16dfe1e Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Tue, 15 Apr 2025 00:01:45 +0530
Subject: [PATCH 1/9] Map visibility explicitly

---
 .../ActivityIndicatorHandler.cs                |  2 +-
 .../iOS/ActivityIndicatorExtensions.cs         | 18 ++++++++++++++++--
 .../src/Platform/iOS/MauiActivityIndicator.cs  |  8 ++++----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
index 57033052b059..f63af2abf6af 100644
--- a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
+++ b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
@@ -22,7 +22,7 @@ public partial class ActivityIndicatorHandler : IActivityIndicatorHandler
 		{
 			[nameof(IActivityIndicator.Color)] = MapColor,
 			[nameof(IActivityIndicator.IsRunning)] = MapIsRunning,
-#if __ANDROID__
+#if __ANDROID__ || IOS || MACCATALYST
 			// Android does not have the concept of IsRunning, so we are leveraging the Visibility
 			[nameof(IActivityIndicator.Visibility)] = MapIsRunning,
 #endif
diff --git a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
index 9e8936dad16d..16ec47a048cd 100644
--- a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
+++ b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
@@ -6,12 +6,26 @@ public static class ActivityIndicatorExtensions
 	{
 		public static void UpdateIsRunning(this UIActivityIndicatorView activityIndicatorView, IActivityIndicator activityIndicator)
 		{
-			if (activityIndicator.IsRunning)
+			activityIndicatorView.Hidden = GetActivityIndicatorVisibility(activityIndicator);
+
+			if (activityIndicator.IsRunning && !activityIndicatorView.Hidden)
 				activityIndicatorView.StartAnimating();
-			else
+			else if(activityIndicatorView.IsAnimating)
 				activityIndicatorView.StopAnimating();
 		}
 
+		private static bool GetActivityIndicatorVisibility(IActivityIndicator activityIndicator)
+		{
+			if (activityIndicator.Visibility == Visibility.Visible)
+			{
+				return !activityIndicator.IsRunning;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
 		public static void UpdateColor(this UIActivityIndicatorView activityIndicatorView, IActivityIndicator activityIndicator)
 			=> activityIndicatorView.Color = activityIndicator.Color?.ToPlatform();
 	}
diff --git a/src/Core/src/Platform/iOS/MauiActivityIndicator.cs b/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
index 7fc1d8cd1c0c..7c3b349e4a81 100644
--- a/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
+++ b/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
@@ -22,9 +22,9 @@ public override void Draw(CGRect rect)
 		{
 			base.Draw(rect);
 
-			if (IsRunning)
+			if (IsRunning && !Hidden)
 				StartAnimating();
-			else
+			else if(IsAnimating)
 				StopAnimating();
 		}
 
@@ -32,9 +32,9 @@ public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
 
-			if (IsRunning)
+			if (IsRunning && !Hidden)
 				StartAnimating();
-			else
+			else if(IsAnimating)
 				StopAnimating();
 		}
 

From af3fee0c340a53e6778d4a749e87594b54616392 Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Tue, 15 Apr 2025 00:05:45 +0530
Subject: [PATCH 2/9] Add UI test

---
 .../TestCases.HostApp/Issues/Issue28968.xaml  | 12 ++++++++++
 .../Issues/Issue28968.xaml.cs                 | 15 ++++++++++++
 .../Tests/Issues/Issue28968.cs                | 23 +++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml
new file mode 100644
index 000000000000..3e342020f1f6
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Controls.TestCases.HostApp.Issues.Issue28968"
+             Title="Issue28968">
+    <VerticalStackLayout VerticalOptions="Center" HorizontalOptions="Center">
+       <ActivityIndicator x:Name="activityIndicator"
+                          AutomationId="MauiActivityIndicator"
+                          IsVisible="False" />
+        <Button AutomationId="MauiButton" Text="Set IsRunning" Clicked="Button_Clicked" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs
new file mode 100644
index 000000000000..d5617f656c2a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs
@@ -0,0 +1,15 @@
+namespace Controls.TestCases.HostApp.Issues;
+
+[Issue(IssueTracker.Github, 28968, "[iOS] [ActivityIndicator] IsRunning ignores IsVisible when set to true",PlatformAffected.iOS)]
+public partial class Issue28968 : ContentPage
+{
+	public Issue28968()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+		activityIndicator.IsRunning = true;
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs
new file mode 100644
index 000000000000..b4ae9b22f78f
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs
@@ -0,0 +1,23 @@
+using UITest.Core;
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace Microsoft.Maui.TestCases.Tests.Tests.Issues;
+
+public class Issue28968 : _IssuesUITest
+{
+	public Issue28968(TestDevice device) : base(device)
+	{
+	}
+
+	public override string Issue => "[iOS] [ActivityIndicator] IsRunning ignores IsVisible when set to true";
+
+    [Test]
+	[Category(UITestCategories.ActivityIndicator)]
+	public void ActivityIndicatorShouldNotIgnoreIsVisible()
+	{
+		App.WaitForElement("MauiButton");
+		App.Tap("MauiButton");
+        App.WaitForNoElement("MauiActivityIndicator");
+	}
+}

From d16c3e165d607d75b1a3f5aa67c1529b3499f77d Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Tue, 15 Apr 2025 21:16:18 +0530
Subject: [PATCH 3/9] Add device test

---
 .../iOS/ActivityIndicatorExtensions.cs        |  4 ++-
 .../ActivityIndicatorHandlerTests.cs          | 29 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
index 16ec47a048cd..3d1d64967b3f 100644
--- a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
+++ b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
@@ -15,13 +15,15 @@ public static void UpdateIsRunning(this UIActivityIndicatorView activityIndicato
 		}
 
 		private static bool GetActivityIndicatorVisibility(IActivityIndicator activityIndicator)
-		{
+		{		
 			if (activityIndicator.Visibility == Visibility.Visible)
 			{
+				// If visibility is set to Visible, hide the native control when it's not running.
 				return !activityIndicator.IsRunning;
 			}
 			else
 			{
+				// If the ActivityIndicator is not visible, always hide the native control.
 				return true;
 			}
 		}
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
index 13f73d557398..cde198c02f63 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
@@ -7,6 +7,35 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.ActivityIndicator)]
 	public partial class ActivityIndicatorHandlerTests : CoreHandlerTestBase<ActivityIndicatorHandler, ActivityIndicatorStub>
 	{
+
+		[Theory(DisplayName = "IsRunning Should Respect IsVisible")]
+		[InlineData(true,true)]
+		[InlineData(true,false)]
+		[InlineData(false,true)]
+		[InlineData(false,false)]
+		public async  Task IsRunningShouldRespectIsVisible(bool _isRunning,bool _isVisible)
+		{
+			var activityIndicator = new ActivityIndicatorStub
+			{
+				IsRunning = _isRunning,
+				Visibility = _isVisible  ? Visibility.Visible :Visibility.Hidden
+			};
+
+			bool isAnimating = false;
+
+			await InvokeOnMainThreadAsync(() =>
+			{
+				var handler = CreateHandler(activityIndicator);
+				isAnimating = GetNativeIsRunning(handler);
+			});
+
+			if (_isVisible && _isRunning)
+            	Assert.True(isAnimating);
+    		else
+        		Assert.False(isAnimating);
+
+		}
+
 		[Theory(DisplayName = "IsRunning Initializes Correctly")]
 		[InlineData(true)]
 		[InlineData(false)]

From fac8246c57ad6ea747fc768658c657314b891524 Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Wed, 16 Apr 2025 20:58:35 +0530
Subject: [PATCH 4/9] update comment

---
 .../src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
index f63af2abf6af..19e123a8c736 100644
--- a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
+++ b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
@@ -23,7 +23,7 @@ public partial class ActivityIndicatorHandler : IActivityIndicatorHandler
 			[nameof(IActivityIndicator.Color)] = MapColor,
 			[nameof(IActivityIndicator.IsRunning)] = MapIsRunning,
 #if __ANDROID__ || IOS || MACCATALYST
-			// Android does not have the concept of IsRunning, so we are leveraging the Visibility
+			// Since Visibility and IsRunning are dependent on each other, we handle Visibility explicitly.
 			[nameof(IActivityIndicator.Visibility)] = MapIsRunning,
 #endif
 #if WINDOWS

From 4330602c5e4e7f2268931db6f1ae182630dccfb2 Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Wed, 16 Apr 2025 23:55:39 +0530
Subject: [PATCH 5/9] Improve Update visibility to fix failing device test

---
 .../iOS/ActivityIndicatorExtensions.cs        | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
index 3d1d64967b3f..733e886746e6 100644
--- a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
+++ b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
@@ -6,7 +6,7 @@ public static class ActivityIndicatorExtensions
 	{
 		public static void UpdateIsRunning(this UIActivityIndicatorView activityIndicatorView, IActivityIndicator activityIndicator)
 		{
-			activityIndicatorView.Hidden = GetActivityIndicatorVisibility(activityIndicator);
+			activityIndicatorView.UpdateActivityIndicatorVisibility(activityIndicator);
 
 			if (activityIndicator.IsRunning && !activityIndicatorView.Hidden)
 				activityIndicatorView.StartAnimating();
@@ -14,17 +14,22 @@ public static void UpdateIsRunning(this UIActivityIndicatorView activityIndicato
 				activityIndicatorView.StopAnimating();
 		}
 
-		private static bool GetActivityIndicatorVisibility(IActivityIndicator activityIndicator)
+		internal static void UpdateActivityIndicatorVisibility(this UIActivityIndicatorView platformView,IActivityIndicator activityIndicator)
 		{		
-			if (activityIndicator.Visibility == Visibility.Visible)
+			switch(activityIndicator.Visibility)
 			{
-				// If visibility is set to Visible, hide the native control when it's not running.
-				return !activityIndicator.IsRunning;
-			}
-			else
-			{
-				// If the ActivityIndicator is not visible, always hide the native control.
-				return true;
+				case Visibility.Visible:
+					platformView.Inflate();
+					platformView.Hidden = !activityIndicator.IsRunning;
+					break;
+				case Visibility.Hidden:
+					platformView.Inflate();
+					platformView.Hidden = true;
+					break;
+				case Visibility.Collapsed:
+					platformView.Hidden = true;
+					platformView.Collapse();
+					break;
 			}
 		}
 

From b2cf5097aae09758f07e07751e2be893c6b79d2d Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Thu, 17 Apr 2025 08:35:29 +0530
Subject: [PATCH 6/9] disable device test on windows

---
 .../ActivityIndicator/ActivityIndicatorHandlerTests.cs         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
index cde198c02f63..a74a264d8224 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.ActivityIndicator)]
 	public partial class ActivityIndicatorHandlerTests : CoreHandlerTestBase<ActivityIndicatorHandler, ActivityIndicatorStub>
 	{
-
+#if !WINDOWS // On Windows, the platform control will return IsActive as true even when the control is not visible.
 		[Theory(DisplayName = "IsRunning Should Respect IsVisible")]
 		[InlineData(true,true)]
 		[InlineData(true,false)]
@@ -35,6 +35,7 @@ await InvokeOnMainThreadAsync(() =>
         		Assert.False(isAnimating);
 
 		}
+#endif
 
 		[Theory(DisplayName = "IsRunning Initializes Correctly")]
 		[InlineData(true)]

From 6331733b03141b6bb5f2eb14e1e2c7a463fe941a Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sun, 8 Feb 2026 18:15:47 +0100
Subject: [PATCH 7/9] Improve tests to properly reproduce ActivityIndicator
 visibility bug

- Replace XAML-based UI test with C#-only HostApp page (per guidelines)
- Use correct namespace (Maui.Controls.Sample.Issues)
- Check native platform Hidden state via handler instead of WaitForNoElement
  which doesn't detect the native-level visibility override
- Add device tests that simulate runtime property changes (IsRunning set
  after handler init) to catch the bug where StartAnimating() overrides
  Hidden state on iOS
- Add Collapsed visibility test case for device tests
---
 .../TestCases.HostApp/Issues/Issue28968.cs    | 69 ++++++++++++++++++
 .../TestCases.HostApp/Issues/Issue28968.xaml  | 12 ---
 .../Issues/Issue28968.xaml.cs                 | 15 ----
 .../Tests/Issues/Issue28968.cs                | 28 +++++--
 .../ActivityIndicatorHandlerTests.cs          | 73 ++++++++++++++++---
 5 files changed, 151 insertions(+), 46 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28968.cs
 delete mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml
 delete mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.cs
new file mode 100644
index 000000000000..091b75ff98e9
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.cs
@@ -0,0 +1,69 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28968, "[iOS] ActivityIndicator IsRunning ignores IsVisible when set to true", PlatformAffected.iOS)]
+public class Issue28968 : ContentPage
+{
+	public Issue28968()
+	{
+		var activityIndicator = new ActivityIndicator
+		{
+			IsVisible = false,
+			AutomationId = "MauiActivityIndicator"
+		};
+
+		var statusLabel = new Label
+		{
+			Text = "Waiting",
+			AutomationId = "StatusLabel"
+		};
+
+		var setRunningButton = new Button
+		{
+			Text = "Set IsRunning = true",
+			AutomationId = "SetRunningButton",
+			Command = new Command(() =>
+			{
+				activityIndicator.IsRunning = true;
+
+				// Check the native platform hidden state after a delay to allow
+				// Draw/LayoutSubviews to execute on iOS
+				Dispatcher.DispatchDelayed(TimeSpan.FromMilliseconds(500), () =>
+				{
+					bool nativeHidden = IsNativeViewHidden(activityIndicator);
+					statusLabel.Text = nativeHidden ? "HIDDEN" : "VISIBLE";
+				});
+			})
+		};
+
+		Content = new VerticalStackLayout
+		{
+			VerticalOptions = LayoutOptions.Center,
+			HorizontalOptions = LayoutOptions.Center,
+			Children =
+			{
+				activityIndicator,
+				setRunningButton,
+				statusLabel
+			}
+		};
+	}
+
+	static bool IsNativeViewHidden(ActivityIndicator indicator)
+	{
+		var handler = indicator.Handler;
+		if (handler?.PlatformView is null)
+			return true;
+
+#if IOS || MACCATALYST
+		if (handler.PlatformView is UIKit.UIView nativeView)
+			return nativeView.Hidden;
+#elif ANDROID
+		if (handler.PlatformView is Android.Views.View nativeView)
+			return nativeView.Visibility != Android.Views.ViewStates.Visible;
+#elif WINDOWS
+		if (handler.PlatformView is Microsoft.UI.Xaml.UIElement nativeView)
+			return nativeView.Visibility != Microsoft.UI.Xaml.Visibility.Visible;
+#endif
+		return true;
+	}
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml
deleted file mode 100644
index 3e342020f1f6..000000000000
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Controls.TestCases.HostApp.Issues.Issue28968"
-             Title="Issue28968">
-    <VerticalStackLayout VerticalOptions="Center" HorizontalOptions="Center">
-       <ActivityIndicator x:Name="activityIndicator"
-                          AutomationId="MauiActivityIndicator"
-                          IsVisible="False" />
-        <Button AutomationId="MauiButton" Text="Set IsRunning" Clicked="Button_Clicked" />
-    </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs
deleted file mode 100644
index d5617f656c2a..000000000000
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28968.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Controls.TestCases.HostApp.Issues;
-
-[Issue(IssueTracker.Github, 28968, "[iOS] [ActivityIndicator] IsRunning ignores IsVisible when set to true",PlatformAffected.iOS)]
-public partial class Issue28968 : ContentPage
-{
-	public Issue28968()
-	{
-		InitializeComponent();
-	}
-
-	private void Button_Clicked(object sender, EventArgs e)
-	{
-		activityIndicator.IsRunning = true;
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs
index b4ae9b22f78f..7787454abdea 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28968.cs
@@ -1,6 +1,6 @@
-using UITest.Core;
 using NUnit.Framework;
 using UITest.Appium;
+using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests.Tests.Issues;
 
@@ -10,14 +10,28 @@ public Issue28968(TestDevice device) : base(device)
 	{
 	}
 
-	public override string Issue => "[iOS] [ActivityIndicator] IsRunning ignores IsVisible when set to true";
+	public override string Issue => "[iOS] ActivityIndicator IsRunning ignores IsVisible when set to true";
 
-    [Test]
+	[Test]
 	[Category(UITestCategories.ActivityIndicator)]
-	public void ActivityIndicatorShouldNotIgnoreIsVisible()
+	public void ActivityIndicatorIsRunningDoesNotOverrideIsVisible()
 	{
-		App.WaitForElement("MauiButton");
-		App.Tap("MauiButton");
-        App.WaitForNoElement("MauiActivityIndicator");
+		App.WaitForElement("SetRunningButton");
+		App.Tap("SetRunningButton");
+
+		// Wait for the status label to update after the delayed check
+		var statusText = App.WaitForElement("StatusLabel").GetText();
+
+		// Retry a few times since the dispatcher delay in the host app
+		// means the label won't update immediately
+		int retries = 10;
+		while (statusText == "Waiting" && retries-- > 0)
+		{
+			Thread.Sleep(200);
+			statusText = App.WaitForElement("StatusLabel").GetText();
+		}
+
+		Assert.That(statusText, Is.EqualTo("HIDDEN"),
+			"ActivityIndicator should remain hidden when IsVisible=false, even after IsRunning is set to true");
 	}
 }
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
index a74a264d8224..5579857dc74d 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
@@ -8,17 +8,17 @@ namespace Microsoft.Maui.DeviceTests
 	public partial class ActivityIndicatorHandlerTests : CoreHandlerTestBase<ActivityIndicatorHandler, ActivityIndicatorStub>
 	{
 #if !WINDOWS // On Windows, the platform control will return IsActive as true even when the control is not visible.
-		[Theory(DisplayName = "IsRunning Should Respect IsVisible")]
-		[InlineData(true,true)]
-		[InlineData(true,false)]
-		[InlineData(false,true)]
-		[InlineData(false,false)]
-		public async  Task IsRunningShouldRespectIsVisible(bool _isRunning,bool _isVisible)
+		[Theory(DisplayName = "IsRunning Should Respect Visibility At Init")]
+		[InlineData(true, true)]
+		[InlineData(true, false)]
+		[InlineData(false, true)]
+		[InlineData(false, false)]
+		public async Task IsRunningShouldRespectVisibilityAtInit(bool isRunning, bool isVisible)
 		{
 			var activityIndicator = new ActivityIndicatorStub
 			{
-				IsRunning = _isRunning,
-				Visibility = _isVisible  ? Visibility.Visible :Visibility.Hidden
+				IsRunning = isRunning,
+				Visibility = isVisible ? Visibility.Visible : Visibility.Hidden
 			};
 
 			bool isAnimating = false;
@@ -29,11 +29,60 @@ await InvokeOnMainThreadAsync(() =>
 				isAnimating = GetNativeIsRunning(handler);
 			});
 
-			if (_isVisible && _isRunning)
-            	Assert.True(isAnimating);
-    		else
-        		Assert.False(isAnimating);
+			if (isVisible && isRunning)
+				Assert.True(isAnimating);
+			else
+				Assert.False(isAnimating);
+		}
+
+		[Fact(DisplayName = "Setting IsRunning After Init Should Respect Hidden Visibility")]
+		public async Task SettingIsRunningAfterInitShouldRespectHiddenVisibility()
+		{
+			var activityIndicator = new ActivityIndicatorStub
+			{
+				IsRunning = false,
+				Visibility = Visibility.Hidden
+			};
+
+			bool isAnimating = false;
+
+			await InvokeOnMainThreadAsync(() =>
+			{
+				var handler = CreateHandler(activityIndicator);
+
+				// Simulate runtime: set IsRunning=true while Visibility=Hidden
+				activityIndicator.IsRunning = true;
+				handler.UpdateValue(nameof(IActivityIndicator.IsRunning));
+
+				isAnimating = GetNativeIsRunning(handler);
+			});
+
+			Assert.False(isAnimating, "ActivityIndicator should not animate when Visibility is Hidden");
+		}
+
+		[Fact(DisplayName = "Setting IsRunning After Init Should Respect Collapsed Visibility")]
+		public async Task SettingIsRunningAfterInitShouldRespectCollapsedVisibility()
+		{
+			var activityIndicator = new ActivityIndicatorStub
+			{
+				IsRunning = false,
+				Visibility = Visibility.Collapsed
+			};
+
+			bool isAnimating = false;
+
+			await InvokeOnMainThreadAsync(() =>
+			{
+				var handler = CreateHandler(activityIndicator);
+
+				// Simulate runtime: set IsRunning=true while Visibility=Collapsed
+				activityIndicator.IsRunning = true;
+				handler.UpdateValue(nameof(IActivityIndicator.IsRunning));
+
+				isAnimating = GetNativeIsRunning(handler);
+			});
 
+			Assert.False(isAnimating, "ActivityIndicator should not animate when Visibility is Collapsed");
 		}
 #endif
 

From 1d34e94b03706522c46848063bc4810fed0b969f Mon Sep 17 00:00:00 2001
From: Bhavanesh N <bhavanesh001@gmail.com>
Date: Mon, 9 Feb 2026 20:12:43 +0530
Subject: [PATCH 8/9] Adjust changes according to copilot feedback

---
 .../ActivityIndicatorHandler.cs               |  2 +-
 .../iOS/ActivityIndicatorExtensions.cs        | 32 ++++++-------------
 .../src/Platform/iOS/MauiActivityIndicator.cs |  8 ++---
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
index 19e123a8c736..3e3c78251ed6 100644
--- a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
+++ b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
@@ -23,7 +23,7 @@ public partial class ActivityIndicatorHandler : IActivityIndicatorHandler
 			[nameof(IActivityIndicator.Color)] = MapColor,
 			[nameof(IActivityIndicator.IsRunning)] = MapIsRunning,
 #if __ANDROID__ || IOS || MACCATALYST
-			// Since Visibility and IsRunning are dependent on each other, we handle Visibility explicitly.
+			// Android/iOS do not respect both properties independently, so we handle Visibility explicitly
 			[nameof(IActivityIndicator.Visibility)] = MapIsRunning,
 #endif
 #if WINDOWS
diff --git a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
index 733e886746e6..088ada9765a7 100644
--- a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
+++ b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
@@ -6,30 +6,18 @@ public static class ActivityIndicatorExtensions
 	{
 		public static void UpdateIsRunning(this UIActivityIndicatorView activityIndicatorView, IActivityIndicator activityIndicator)
 		{
-			activityIndicatorView.UpdateActivityIndicatorVisibility(activityIndicator);
 
-			if (activityIndicator.IsRunning && !activityIndicatorView.Hidden)
-				activityIndicatorView.StartAnimating();
-			else if(activityIndicatorView.IsAnimating)
-				activityIndicatorView.StopAnimating();
-		}
-
-		internal static void UpdateActivityIndicatorVisibility(this UIActivityIndicatorView platformView,IActivityIndicator activityIndicator)
-		{		
-			switch(activityIndicator.Visibility)
+				// Only show and animate if both IsRunning AND Visibility == Visible
+			if (activityIndicator.IsRunning && activityIndicator.Visibility == Visibility.Visible)
+			{
+				activityIndicatorView.Hidden = false;
+ 				activityIndicatorView.StartAnimating();
+			}
+			else
 			{
-				case Visibility.Visible:
-					platformView.Inflate();
-					platformView.Hidden = !activityIndicator.IsRunning;
-					break;
-				case Visibility.Hidden:
-					platformView.Inflate();
-					platformView.Hidden = true;
-					break;
-				case Visibility.Collapsed:
-					platformView.Hidden = true;
-					platformView.Collapse();
-					break;
+				if (activityIndicatorView.IsAnimating)
+					activityIndicatorView.StopAnimating();
+				activityIndicatorView.Hidden = true;
 			}
 		}
 
diff --git a/src/Core/src/Platform/iOS/MauiActivityIndicator.cs b/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
index 7c3b349e4a81..c418f83da39c 100644
--- a/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
+++ b/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
@@ -22,9 +22,9 @@ public override void Draw(CGRect rect)
 		{
 			base.Draw(rect);
 
-			if (IsRunning && !Hidden)
+			if (IsRunning)
 				StartAnimating();
-			else if(IsAnimating)
+			else
 				StopAnimating();
 		}
 
@@ -32,9 +32,9 @@ public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
 
-			if (IsRunning && !Hidden)
+			if (IsRunning)
 				StartAnimating();
-			else if(IsAnimating)
+			else 
 				StopAnimating();
 		}
 

From 6eb61a14612ee87694c9668c6fbaee273824766d Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Wed, 4 Mar 2026 00:53:02 +0100
Subject: [PATCH 9/9] Apply AI summary ActivityIndicator fixes

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../ActivityIndicator/ActivityIndicatorHandler.cs   |  4 ++--
 .../src/Platform/iOS/ActivityIndicatorExtensions.cs | 10 +++++-----
 src/Core/src/Platform/iOS/MauiActivityIndicator.cs  | 13 ++++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
index 3e3c78251ed6..10e9986a6fee 100644
--- a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
+++ b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs
@@ -22,7 +22,7 @@ public partial class ActivityIndicatorHandler : IActivityIndicatorHandler
 		{
 			[nameof(IActivityIndicator.Color)] = MapColor,
 			[nameof(IActivityIndicator.IsRunning)] = MapIsRunning,
-#if __ANDROID__ || IOS || MACCATALYST
+#if __ANDROID__ || __IOS__ || MACCATALYST
 			// Android/iOS do not respect both properties independently, so we handle Visibility explicitly
 			[nameof(IActivityIndicator.Visibility)] = MapIsRunning,
 #endif
@@ -91,4 +91,4 @@ public ActivityIndicatorHandler(IPropertyMapper? mapper, CommandMapper? commandM
 		public static partial void MapBackground(IActivityIndicatorHandler handler, IActivityIndicator activityIndicator);
 #endif
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
index 088ada9765a7..b00902d937a9 100644
--- a/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
+++ b/src/Core/src/Platform/iOS/ActivityIndicatorExtensions.cs
@@ -6,22 +6,22 @@ public static class ActivityIndicatorExtensions
 	{
 		public static void UpdateIsRunning(this UIActivityIndicatorView activityIndicatorView, IActivityIndicator activityIndicator)
 		{
-
-				// Only show and animate if both IsRunning AND Visibility == Visible
+			// Only show and animate if both IsRunning AND Visibility == Visible
 			if (activityIndicator.IsRunning && activityIndicator.Visibility == Visibility.Visible)
 			{
 				activityIndicatorView.Hidden = false;
- 				activityIndicatorView.StartAnimating();
+				activityIndicatorView.StartAnimating();
 			}
 			else
 			{
 				if (activityIndicatorView.IsAnimating)
 					activityIndicatorView.StopAnimating();
-				activityIndicatorView.Hidden = true;
+
+				activityIndicatorView.Hidden = activityIndicator.Visibility != Visibility.Visible;
 			}
 		}
 
 		public static void UpdateColor(this UIActivityIndicatorView activityIndicatorView, IActivityIndicator activityIndicator)
 			=> activityIndicatorView.Color = activityIndicator.Color?.ToPlatform();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Platform/iOS/MauiActivityIndicator.cs b/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
index c418f83da39c..14aa212e7fa1 100644
--- a/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
+++ b/src/Core/src/Platform/iOS/MauiActivityIndicator.cs
@@ -10,7 +10,10 @@ public class MauiActivityIndicator : UIActivityIndicatorView, IUIViewLifeCycleEv
 	{
 		readonly WeakReference<IActivityIndicator>? _virtualView;
 
-		bool IsRunning => _virtualView is not null && _virtualView.TryGetTarget(out var a) ? a.IsRunning : false;
+		bool IsRunningAndVisible => _virtualView is not null &&
+			_virtualView.TryGetTarget(out var a) &&
+			a.IsRunning &&
+			a.Visibility == Visibility.Visible;
 
 		public MauiActivityIndicator(CGRect rect, IActivityIndicator? virtualView) : base(rect)
 		{
@@ -22,7 +25,7 @@ public override void Draw(CGRect rect)
 		{
 			base.Draw(rect);
 
-			if (IsRunning)
+			if (IsRunningAndVisible)
 				StartAnimating();
 			else
 				StopAnimating();
@@ -32,9 +35,9 @@ public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
 
-			if (IsRunning)
+			if (IsRunningAndVisible)
 				StartAnimating();
-			else 
+			else
 				StopAnimating();
 		}
 
@@ -57,4 +60,4 @@ public override void MovedToWindow()
 			_movedToWindow?.Invoke(this, EventArgs.Empty);
 		}
 	}
-}
\ No newline at end of file
+}