[Android] Implemented material3 support for ActivityIndicator

[Dhivya-SF4094]

Description of Change

This pull request introduces support for a Material Design 3 styled ActivityIndicator on Android, allowing the app to use the new Material component when the Material3 feature is enabled. The main changes involve conditional registration of a new handler, the implementation of a MaterialActivityIndicatorHandler, and the addition of a custom MaterialActivityIndicator control for Android.

Material3 ActivityIndicator support for Android:

• Added a new MaterialActivityIndicatorHandler class that extends ActivityIndicatorHandler and creates a MaterialActivityIndicator (the new Material3 control) as its platform view. It also customizes layout behavior to ensure proper sizing and centering.
• Implemented the MaterialActivityIndicator control in MaterialActivityIndicator.cs, inheriting from CircularProgressIndicator and overriding measurement logic to ensure the indicator remains square and properly sized according to Material guidelines.

Handler registration logic:

• Updated the AddControlsHandlers extension method to conditionally register either MaterialActivityIndicatorHandler or the classic ActivityIndicatorHandler for ActivityIndicator, based on whether Material3 is enabled on Android.

Issues Fixed

Fixes #33479

Material3 Spec ActivityIndicator

Output Screenshot

Material 2	Material 3
Material2_ActivityIndicator.mov	Material3_ActivityIndicator.mov

[Copilot]

Pull request overview

This PR adds Material Design 3 support for ActivityIndicator on Android. When Material3 is enabled via the RuntimeFeature.IsMaterial3Enabled feature flag, the framework will use a new MaterialActivityIndicator control that inherits from Google's CircularProgressIndicator instead of the standard Android ProgressBar.

Changes:

• Introduced MaterialActivityIndicator control that wraps Material3's CircularProgressIndicator with custom measurement logic to ensure the indicator remains square
• Added ActivityIndicatorHandler2 that creates and arranges the Material3 control
• Updated handler registration to conditionally use Material3 handler based on RuntimeFeature.IsMaterial3Enabled flag on Android

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

File	Description
src/Core/src/Platform/Android/Material3Controls/MaterialActivityIndicator.cs	New Material3 circular progress indicator control with custom measurement to enforce square dimensions
src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs	Added Material3 handler variant (ActivityIndicatorHandler2) with custom PlatformArrange for proper centering and sizing
src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs	Conditional handler registration: Material3 handler when feature enabled, standard handler otherwise

[Copilot]

The class name "ActivityIndicatorHandler2" is unclear and doesn't convey that this is the Material3 implementation. The "Handler2" suffix is used elsewhere in the codebase (CollectionViewHandler2, CarouselViewHandler2) for iOS/MacCatalyst rewrites, not for Material variants. Consider renaming to "MaterialActivityIndicatorHandler" to better indicate its purpose and align with Material naming conventions seen in compatibility renderers.

Suggested change

	internal partial class ActivityIndicatorHandler2 : ActivityIndicatorHandler
	internal partial class MaterialActivityIndicatorHandler : ActivityIndicatorHandler

[Copilot]

The new Material3 ActivityIndicatorHandler2 implementation lacks test coverage. The existing ActivityIndicatorHandlerTests.Android.cs only tests the base ActivityIndicatorHandler and expects a ProgressBar as the platform view. Consider adding tests specifically for Material3 mode that verify MaterialActivityIndicator is created when RuntimeFeature.IsMaterial3Enabled is true, and that the PlatformArrange override correctly centers and constrains the indicator.

[rmarinho]

🤖 AI Summary

📊 Expand Full Review

---

🔍 Pre-Flight — Context & Validation

---

📝 Review Session — Updated ActivityIndicatorhandler · a1ac3b0

---

Issue: #33479 - Implement material3 support for ActivityIndicator
PR: #33481 - [Android] Implemented material3 support for ActivityIndicator
Author: Dhivya-SF4094 (partner/syncfusion)
Platforms Affected: Android only
Files Changed: 3 implementation files, 0 test files

Summary

This PR implements Material Design 3 support for the ActivityIndicator control on Android. When RuntimeFeature.IsMaterial3Enabled is true, a new MaterialActivityIndicatorHandler (currently named ActivityIndicatorHandler2) is registered instead of the standard ActivityIndicatorHandler. This new handler creates a MaterialActivityIndicator (wrapping Google's CircularProgressIndicator) as its platform view.

Files Changed

Fix files:

• src/Core/src/Platform/Android/Material3Controls/MaterialActivityIndicator.cs (+45) - New Material3 circular progress indicator with custom OnMeasure to enforce square dimensions
• src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs (+40, -1) - Added ActivityIndicatorHandler2 (Material3 handler) with custom PlatformArrange for proper centering/sizing
• src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs (+13, -1) - Conditional handler registration based on RuntimeFeature.IsMaterial3Enabled

Test files: None

Key Findings

1. No test coverage added - The PR adds no UI tests or device tests for the new Material3 behavior. The Copilot reviewer flagged this explicitly.
2. Naming concern - Handler is named ActivityIndicatorHandler2 which is confusing (the Handler2 suffix is used for iOS/MacCatalyst rewrites elsewhere). Copilot reviewer suggested MaterialActivityIndicatorHandler.
3. Internal/TODO comments - Both new classes have // TODO: material3 - make it public in .net 11 comments, indicating these are intentionally internal for now.
4. Padding calculation note - The Copilot reviewer suggested a padding fix in OnMeasure (resolved but in outdated state).

PR Discussion Summary

Copilot Reviewer Comments (4 total, 2 unresolved):

Comment	Status
Padding calculation should use Math.Max(horizontal, vertical) instead of one combined expression	✅ Resolved (outdated)
Misleading comment about "Material2-aligned" sizing	✅ Resolved (outdated)
ActivityIndicatorHandler2 naming is confusing - should be MaterialActivityIndicatorHandler	⚠️ UNRESOLVED
No test coverage for Material3 mode	⚠️ UNRESOLVED

Fix Candidates

#	Source	Approach	Test Result	Files Changed	Notes
PR	PR #33481	Add MaterialActivityIndicator + ActivityIndicatorHandler2, conditional registration	⏳ PENDING (Gate)	3 files (+98/-2)	Original PR

---

🚦 Gate — Test Verification

---

📝 Review Session — Updated ActivityIndicatorhandler · a1ac3b0

---

Result: ❌ FAILED
Platform: android
Mode: No tests found

Summary

No UI tests exist for issue #33479 (TestFilter: "Issue33479") in either:

• src/Controls/tests/TestCases.HostApp/Issues/
• src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/

No device tests for MaterialActivityIndicator or ActivityIndicatorHandler2 were found in:

• src/Core/tests/DeviceTests/Handlers/ActivityIndicator/

The existing ActivityIndicatorHandlerTests.Android.cs only tests the base ActivityIndicatorHandler (expects ProgressBar as platform view).

Reason for Failure

Tests are absent — the Gate cannot verify that tests catch the bug/feature before the fix and pass with the fix. Per the Gate workflow, this PR cannot proceed until tests are added.

Recommendation

The PR author should add tests. The write-tests-agent can help create appropriate tests:

• A UI test (Issue33479.cs) that verifies the ActivityIndicator renders with the Material3 style when Material3 is enabled
• Or device tests verifying MaterialActivityIndicator is used as the platform view when IsMaterial3Enabled is true

---

📋 Report — Final Recommendation

---

📝 Review Session — Updated ActivityIndicatorhandler · a1ac3b0

---

⚠️ Final Recommendation: REQUEST CHANGES

Summary

PR #33481 implements Material Design 3 support for ActivityIndicator on Android by adding a new MaterialActivityIndicator control and ActivityIndicatorHandler2 (Material3 handler), with conditional handler registration. The implementation is directionally correct, but the PR lacks test coverage, and there is a naming issue with the handler.

Root Cause (Issue #33479)

When Material3 is enabled, the Android ActivityIndicator still uses the legacy ProgressBar-based ActivityIndicatorHandler. The fix introduces MaterialActivityIndicator (wrapping CircularProgressIndicator from Material3 library) and a new handler that creates it as the platform view.

Gate Result: ❌ FAILED — No Tests

No tests exist for this issue. The Gate cannot verify that tests catch the feature behavior. Gate is required to pass before Phase 3 (Fix exploration) can run.

Required Changes

1. Add tests — The PR has no test coverage for the new Material3 behavior. At minimum:

   • A UI test (Issue33479.cs) for TestCases.HostApp + TestCases.Shared.Tests that verifies the ActivityIndicator renders with Material3 styling when enabled; OR
   • Device tests in ActivityIndicatorHandlerTests.Android.cs verifying that MaterialActivityIndicator is used as the platform view when RuntimeFeature.IsMaterial3Enabled is true

2. Rename ActivityIndicatorHandler2 — The Handler2 suffix is reserved by convention for iOS/MacCatalyst rewrites (e.g., CollectionViewHandler2, CarouselViewHandler2). For Material3 variants, use MaterialActivityIndicatorHandler. The Copilot reviewer flagged this in an unresolved thread.

Positive Aspects

• Conditional handler registration is clean and follows the pattern used by other Material3 controls
• The MaterialActivityIndicator measurement override (OnMeasure) correctly enforces square dimensions
• Internal/TODO markers show appropriate awareness that this will be made public in .NET 11
• The PlatformArrange override in the handler correctly centers the constrained indicator within its allocated frame
• Uses MauiMaterialContextThemeWrapper.Create(context) for proper Material3 theming

Fix Candidates

Phase 3 (Fix exploration) was skipped because Gate ❌ FAILED. The PR's approach cannot be validated without tests.

#	Source	Approach	Test Result	Files Changed	Notes
PR	PR #33481	MaterialActivityIndicator + ActivityIndicatorHandler2 + conditional registration	❌ Gate failed (no tests)	3 files	Missing tests, naming issue

---

📋 Expand PR Finalization Review

---

Title: ✅ Good

Current: [Android] Implemented material3 support for ActivityIndicator

Description: ✅ Good

Description needs updates. See details below.

✨ Suggested PR Description

[!NOTE]
Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Description of Change

This pull request adds Material Design 3 styled ActivityIndicator support on Android. When the Material3 feature flag (RuntimeFeature.IsMaterial3Enabled) is enabled, MAUI now uses a new MaterialActivityIndicatorHandler backed by the MDC CircularProgressIndicator component instead of the legacy ProgressBar-based ActivityIndicatorHandler.

Handler registration (AppHostBuilderExtensions.cs):

• On Android with Material3 enabled: registers MaterialActivityIndicatorHandler for ActivityIndicator
• On Android without Material3 / all other platforms: registers classic ActivityIndicatorHandler

MaterialActivityIndicatorHandler (ActivityIndicatorHandler.Android.cs):

• Extends ActivityIndicatorHandler
• Creates MaterialActivityIndicator (MDC CircularProgressIndicator) as the platform view with Indeterminate = true
• Overrides PlatformArrange to constrain the indicator to its desired size and center it within the layout frame, preventing unwanted stretching from parent layouts

MaterialActivityIndicator (Platform/Android/Material3Controls/MaterialActivityIndicator.cs):

• Extends MDC CircularProgressIndicator
• Uses MauiMaterialContextThemeWrapper so the indicator picks up the app's Material3 theme
• Overrides OnMeasure to enforce a square aspect ratio based on IndicatorSize plus padding, following Material3 specs

Both new classes are internal with a TODO: material3 - make it public in .net 11 comment.

Issues Fixed

Fixes #33479

Material3 Spec Reference: Progress Indicators – Material Design 3

Code Review: ⚠️ Issues Found

Code Review: PR #33481

🔴 Critical Issues

1. ActivityIndicatorHandler2 — Misleading Name

File: src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs
Problem: The Handler2 suffix is used elsewhere in MAUI exclusively for iOS/MacCatalyst handler rewrites (CollectionViewHandler2, CarouselViewHandler2). Using it here for a Material3 variant on Android is inconsistent and confusing. An open (unresolved) review comment also flags this.
Recommendation: Rename to MaterialActivityIndicatorHandler.

// Current:
internal class ActivityIndicatorHandler2 : ActivityIndicatorHandler

// Recommended:
internal partial class MaterialActivityIndicatorHandler : ActivityIndicatorHandler

The description already uses the name MaterialActivityIndicatorHandler, so this rename would also fix the description accuracy issue.

---

🟡 Suggestions

2. Missing partial keyword on new handler class

File: src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs
Problem: ActivityIndicatorHandler2 is declared as internal class, not internal partial class. Other handlers in MAUI use partial to allow platform-specific extensions. The review comment's suggestion also includes partial.
Recommendation: Add partial:

internal partial class MaterialActivityIndicatorHandler : ActivityIndicatorHandler

---

3. Missing test coverage for Material3 path

File: (no new test file added)
Problem: The new ActivityIndicatorHandler2 / Material3 code path has no unit or device tests. Existing ActivityIndicatorHandlerTests.Android.cs only tests ActivityIndicatorHandler against ProgressBar. An unresolved review comment also flags this.
Recommendation: Add tests that verify:

• When RuntimeFeature.IsMaterial3Enabled is true, MaterialActivityIndicator is created as platform view
• PlatformArrange correctly constrains and centers the indicator within the layout frame
• Color mapping still works via the base handler

---

4. Missing newline at end of files

Files:

• src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs
• src/Core/src/Platform/Android/Material3Controls/MaterialActivityIndicator.cs

Both files end with } and no trailing newline (\ No newline at end of file in the diff). Standard .NET/MAUI repo style requires a trailing newline.

---

5. PlatformArrange fallback values

File: src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs
Code:

var desiredWidth = VirtualView?.DesiredSize.Width ?? frame.Width;
var desiredHeight = VirtualView?.DesiredSize.Height ?? frame.Height;

Observation: When VirtualView is null, this falls back to the full frame dimensions, which means the centering math (frame.Width - constrainedWidth) / 2) yields 0 and no centering occurs. This is acceptable behavior (null VirtualView means the handler is disconnecting), but a null guard at the top (already present via if (Context == null || PlatformView == null)) doesn't cover VirtualView == null. Low risk, but worth noting.

---

✅ Looks Good

• MauiMaterialContextThemeWrapper.Create(context) — Consistent with other Material3 controls in the repo (e.g., MaterialButton, MaterialEntry). Correct approach for ensuring MDC theme resources are applied.
• Indeterminate = true in CreatePlatformView — Correct for ActivityIndicator semantics (always spinning, no determinate value).
• OnMeasure square enforcement — Enforcing a square aspect ratio in MaterialActivityIndicator.OnMeasure is the right approach; CircularProgressIndicator can otherwise take non-square dimensions if not constrained.
• #if ANDROID guard in AppHostBuilderExtensions.cs — Correct pattern for platform-conditional handler registration.
• internal visibility with TODO comment — Appropriate staging approach; keeps the API surface small until Material3 is fully public in .NET 11.

---

[Dhivya-SF4094]

Addressed all valid concern.

[sheiksyedm]

/azp run maui-pr-uitests

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[jfversluis]

Multi-Model Code Review (Sonnet 4.5 / GPT 5.1 / Gemini 3 Pro)

---

🟠 Incorrect Measurement Logic in MaterialActivityIndicator.OnMeasure

Severity: High | Found by: Sonnet 4.5

The OnMeasure method uses Math.Max of horizontal and vertical padding, then applies that single value to both dimensions. This produces incorrect sizing when horizontal and vertical padding differ:

csharp // Current code var desiredSize = IndicatorSize + Math.Max(PaddingLeft + PaddingRight, PaddingTop + PaddingBottom);

Example: IndicatorSize=48, horizontal padding=20, vertical padding=10 → both width and height report 68, but height should be 58.

Fix: Calculate each dimension independently:
`csharp
var desiredWidth = IndicatorSize + PaddingLeft + PaddingRight;
var desiredHeight = IndicatorSize + PaddingTop + PaddingBottom;

var width = ResolveSize(desiredWidth, widthMeasureSpec);
var height = ResolveSize(desiredHeight, heightMeasureSpec);

var finalSize = Math.Min(width, height);
SetMeasuredDimension(finalSize, finalSize);
`

This ensures padding is properly accounted for in each dimension before constraining to a square.

[Dhivya-SF4094]

Multi-Model Code Review (Sonnet 4.5 / GPT 5.1 / Gemini 3 Pro)

🟠 Incorrect Measurement Logic in MaterialActivityIndicator.OnMeasure

Severity: High | Found by: Sonnet 4.5

The OnMeasure method uses Math.Max of horizontal and vertical padding, then applies that single value to both dimensions. This produces incorrect sizing when horizontal and vertical padding differ:

csharp // Current code var desiredSize = IndicatorSize + Math.Max(PaddingLeft + PaddingRight, PaddingTop + PaddingBottom);

Example: IndicatorSize=48, horizontal padding=20, vertical padding=10 → both width and height report 68, but height should be 58.

Fix: Calculate each dimension independently: `csharp var desiredWidth = IndicatorSize + PaddingLeft + PaddingRight; var desiredHeight = IndicatorSize + PaddingTop + PaddingBottom;

var width = ResolveSize(desiredWidth, widthMeasureSpec); var height = ResolveSize(desiredHeight, heightMeasureSpec);

var finalSize = Math.Min(width, height); SetMeasuredDimension(finalSize, finalSize); `

This ensures padding is properly accounted for in each dimension before constraining to a square.

@jfversluis, Thanks for the suggestion.

After reviewing this carefully, the current Math.Max implementation is intentional and correct because ActivityIndicator is always forced to a square (SetMeasuredDimension(finalSize, finalSize)).
Since the final size is constrained using:
var finalSize = Math.Min(width, height);
both dimensions cannot truly be treated independently. If we calculate width and height separately and then collapse to a square using Math.Min, the larger padding axis can get reduced, effectively discarding part of the requested padding.

Example:
IndicatorSize = 105px
Horizontal padding = 20px
Vertical padding = 10px

Independent calculation:
desiredWidth = 125
desiredHeight = 115
finalSize = 115 (after Math.Min)

This reduces the horizontal padding below what was requested.
Using IndicatorSize + Math.Max(horizontalPadding, verticalPadding)
ensures the square size is large enough to fully respect the most demanding padding axis. The other axis may receive slightly extra space, which is visually harmless and preserves the padding contract.
The independent-axis approach would be correct for non-square controls, but for a square-constrained view, Math.Max is the appropriate behavior.