Skip to content

[Android] Fixed back button icon selection logic in ShellToolbarTracker#32080

Merged
kubaflo merged 2 commits intodotnet:inflight/currentfrom
kubaflo:fix-32050
Mar 31, 2026
Merged

[Android] Fixed back button icon selection logic in ShellToolbarTracker#32080
kubaflo merged 2 commits intodotnet:inflight/currentfrom
kubaflo:fix-32050

Conversation

@kubaflo
Copy link
Copy Markdown
Contributor

@kubaflo kubaflo commented Oct 19, 2025 •
edited
Loading

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

Updates the logic for selecting the back button icon to use the IconOverride property when FlyoutBehavior is not Flyout. This ensures the correct icon is displayed based on the current behavior.

Regressing PR: #29637

Issues Fixed

Fixes #32050

Copilot AI review requested due to automatic review settings October 19, 2025 13:04
@dotnet-policy-service dotnet-policy-service Bot added the community ✨ Community Contribution label Oct 19, 2025
@kubaflo kubaflo changed the base branch from main to net10.0 October 19, 2025 13:06
@kubaflo kubaflo changed the title Fix 32050 [Android] Fixed back button icon selection logic in ShellToolbarTracker Oct 19, 2025
@kubaflo kubaflo self-assigned this Oct 19, 2025
@kubaflo kubaflo added platform/android area-controls-shell Shell Navigation, Routes, Tabs, Flyout labels Oct 19, 2025
Copilot AI reviewed Oct 19, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@jsuarezruiz
Copy link
Copy Markdown
Contributor

jsuarezruiz commented Oct 20, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Oct 20, 2025

Azure Pipelines successfully started running 3 pipeline(s).

jsuarezruiz
jsuarezruiz suggested changes Oct 22, 2025
View reviewed changes
Comment thread src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs
@jsuarezruiz
Copy link
Copy Markdown
Contributor

jsuarezruiz commented Oct 23, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Oct 23, 2025

Azure Pipelines successfully started running 3 pipeline(s).

Copilot AI mentioned this pull request Nov 20, 2025
Draft
5 tasks
Copilot AI added a commit to kubaflo/maui that referenced this pull request Nov 20, 2025
@kubaflo
Complete code review for PR dotnet#32080
a8e0cd0 
Co-authored-by: kubaflo <42434498+kubaflo@users.noreply.github.com>
@kubaflo
Copy link
Copy Markdown
Contributor Author

kubaflo commented Nov 20, 2025

Review Feedback: PR #32080 - Fix IconOverride in Shell.BackButtonBehavior

Summary

PR #32080 correctly fixes the regression where BackButtonBehavior.IconOverride was ignored on Android when FlyoutBehavior is not Flyout. The fix is minimal, focused, and addresses the root cause identified in PR #29637.

Recommendation: ✅ Approve with minor test improvements

Code Review

Core Fix Analysis

File: src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs

Change (Line 415):

// Before (regressed in PR #29637):
var image = _flyoutBehavior == FlyoutBehavior.Flyout ? GetFlyoutIcon(backButtonHandler, page) : null;

// After (this PR):
var image = _flyoutBehavior == FlyoutBehavior.Flyout ? GetFlyoutIcon(backButtonHandler, page) : backButtonHandler.GetPropertyIfSet<ImageSource>(BackButtonBehavior.IconOverrideProperty, null);

Why it works:

  • GetFlyoutIcon() (line 368) already checks IconOverride FIRST, then falls back to FlyoutIcon
  • When FlyoutBehavior == Flyout: Uses GetFlyoutIcon() which tries IconOverride → FlyoutIcon
  • When FlyoutBehavior != Flyout: Directly retrieves IconOverride (no FlyoutIcon fallback needed)
  • The regression occurred because the else branch was changed to null, completely ignoring IconOverride

Edge cases considered:

  • ✅ IconOverride with Flyout behavior → Still works (uses GetFlyoutIcon)
  • ✅ IconOverride without Flyout behavior → Fixed by this PR
  • ✅ No IconOverride set → Returns null (correct default behavior)
  • ✅ Multiple navigation levels → IconOverride is per-page, so works correctly

Code Quality:

  • ✅ Minimal change (single line)
  • ✅ No performance impact
  • ✅ Follows existing patterns
  • ✅ Proper null handling

Test Coverage Review

UI Tests Added

Files:

  • src/Controls/tests/TestCases.HostApp/Issues/Issue32050.xaml
  • src/Controls/tests/TestCases.HostApp/Issues/Issue32050.xaml.cs
  • src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32050.cs

Test Structure: ✅ Follows established patterns

  • Shell-based test page with navigation to subpage
  • Subpage sets BackButtonBehavior.IconOverride = "coffee.png"
  • Appium test waits for element and captures screenshot

Issues Found in Tests

🔴 Critical Issue #1: Wrong Platform Attribute

Location: src/Controls/tests/TestCases.HostApp/Issues/Issue32050.xaml.cs line 3

Current:

[Issue(IssueTracker.Github, 32050, "IconOverride in Shell.BackButtonBehavior does not work.", PlatformAffected.iOS)]

Should be:

[Issue(IssueTracker.Github, 32050, "IconOverride in Shell.BackButtonBehavior does not work.", PlatformAffected.Android)]

Why:

🟡 Suggestion #1: Wrong Test Category

Location: src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32050.cs line 16

Current:

[Category(UITestCategories.TitleView)]

Should be:

[Category(UITestCategories.Shell)]

Why:

  • This tests Shell back button behavior, not TitleView
  • Using wrong category makes test harder to find and may skip it in Shell-specific test runs
  • Check UITestCategories.cs for available categories

💡 Suggestion #2: Test Coverage

Current approach: Screenshot-only verification

Enhancement opportunity:

  • Screenshot verification is appropriate for icon appearance
  • Consider adding programmatic check if icon element is present (if Appium exposes it)
  • Current approach is acceptable for this fix

Testing

Manual Testing (Checkpoint Required)

❌ Unable to test on Android: No Android SDK/emulator available in current environment

Testing checkpoint created:

  • ✅ Test code prepared in Sandbox app
  • ✅ Test approach validated
  • ⏸️ Requires Android device/emulator to complete validation

Recommended Testing Steps

  1. Test WITHOUT PR (verify bug exists):

    # Checkout version before fix
git checkout 8b0b8be8 -- src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs

# Build and deploy
dotnet build src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj -f net10.0-android -t:Run

# Navigate to second page
# Expected: Back button shows default arrow (BUG)

  2. Test WITH PR (verify fix works):

    # Restore PR version
git checkout pr-32080 -- src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs

# Build and deploy
dotnet build src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj -f net10.0-android -t:Run

# Navigate to second page
# Expected: Back button shows custom icon (FIXED)

Security Review

✅ No security concerns:

  • Changes only affect icon selection logic
  • No user input handling
  • No external data access
  • No new dependencies

Breaking Changes

✅ No breaking changes:

  • Restores previous behavior (fixes regression)
  • No API changes
  • No behavioral changes for other scenarios

Documentation

✅ Adequate:

  • PR description clearly explains the issue and fix
  • Code comment removed (was outdated)
  • No XML doc changes needed (internal implementation)

Issues to Address

Must Fix Before Merge

  1. ✅ Core fix: Correct and complete
  2. 🔴 Platform attribute: Change PlatformAffected.iOS to PlatformAffected.Android in Issue32050.xaml.cs

Should Fix (Recommended)

  1. 🟡 Test category: Change UITestCategories.TitleView to UITestCategories.Shell in Issue32050.cs

Optional Improvements

  1. 💡 Consider adding comment explaining the ternary logic for future maintainers: 
    // When Flyout behavior is active, GetFlyoutIcon checks IconOverride then FlyoutIcon
// Otherwise, just use IconOverride directly (no FlyoutIcon fallback)
var image = _flyoutBehavior == FlyoutBehavior.Flyout ? GetFlyoutIcon(backButtonHandler, page) : backButtonHandler.GetPropertyIfSet<ImageSource>(BackButtonBehavior.IconOverrideProperty, null);

Approval Checklist

  • Code solves the stated problem correctly
  • Minimal, focused changes
  • No breaking changes
  • Appropriate test coverage exists
  • No security concerns
  • Follows .NET MAUI conventions
  • Platform attribute needs correction (blocking)
  • Test category should be updated (recommended)
  • Manual Android testing needed (cannot complete in current environment)

Final Recommendation

Status: ✅ Approve with required changes

Required changes:

  1. Fix platform attribute: PlatformAffected.iOS → PlatformAffected.Android

Recommended changes:
2. Update test category: UITestCategories.TitleView → UITestCategories.Shell

Manual testing: Should be performed on Android device/emulator before final merge to visually confirm the icon appears correctly.

Review Metadata

@kubaflo kubaflo changed the base branch from net10.0 to main December 13, 2025 14:27
@kubaflo kubaflo mentioned this pull request Dec 13, 2025
Closed
kubaflo and others added 2 commits March 16, 2026 22:27
@kubaflo
[Android] Fixed back button icon selection logic in ShellToolbarTracker
7545092 
Updates the logic for selecting the back button icon to use the IconOverride property when FlyoutBehavior is not Flyout. This ensures the correct icon is displayed based on the current behavior.
@kubaflo
Added a UITest
6f371b2
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 16, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 32080

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 32080"

@MauiBot
Copy link
Copy Markdown
Collaborator

MauiBot commented Mar 22, 2026 •
edited
Loading

🤖 AI Summary

📊 Expand Full Review — 6f371b2 · Added a UITest
🔍 Pre-Flight — Context & Validation

Issue: #32050 - IconOverride in Shell.BackButtonBehavior does not work.
PR: #32080 - [Android] Fixed back button icon selection logic in ShellToolbarTracker
Platforms Affected: Android
Files Changed: 1 implementation, 3 test

Key Findings

  • Issue IconOverride in Shell.BackButtonBehavior does not work. #32050 is Android-specific, reproducible from 9.0.80 onward, and was validated by the MAUI team in VS Code across multiple 9.0 builds.
  • The PR description links PR [Android/ iOS] Fix Flyout icon is displayed when flyout is disabled  #29637 as the regressing change and limits the implementation change to src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs.
  • Review discussion requested a related UITest; the PR now includes HostApp + Shared.Tests coverage under Issue32050.
  • Prior PR discussion includes an agent-style review comment flagging possible test metadata issues (platform/category), which should be validated during later phases rather than assumed correct.

File Classification

  • Implementation: src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs
  • Test HostApp: src/Controls/tests/TestCases.HostApp/Issues/Issue32050.xaml
  • Test HostApp code-behind: src/Controls/tests/TestCases.HostApp/Issues/Issue32050.xaml.cs
  • Test Appium/NUnit: src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32050.cs

Discussion / Edge Cases

  • Reported behavior: BackButtonBehavior.IconOverride is ignored and the default back arrow remains visible, or only whitespace appears.
  • The issue reproduces on Android 15 / API 35 and was later validated by the MAUI team as a regression beginning in 9.0.80.
  • PR discussion did not raise alternative functional edge cases beyond ensuring a UITest exists.

Fix Candidates

# Source Approach Test Result Files Changed Notes
PR PR #32080 When FlyoutBehavior is not Flyout, use BackButtonBehavior.IconOverrideProperty instead of null for the back button image selection. ⏳ PENDING (Gate) src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs Original PR

Issue: #32050 - IconOverride in Shell.BackButtonBehavior does not work.
PR: #32080 - [Android] Fixed back button icon selection logic in ShellToolbarTracker
Platforms Affected: Android
Files Changed: 1 implementation, 3 test

Key Findings

  • Issue IconOverride in Shell.BackButtonBehavior does not work. #32050 is an Android-specific regression introduced in PR [Android/ iOS] Fix Flyout icon is displayed when flyout is disabled  #29637 (confirmed regression starting in 9.0.80).
  • The fix is in ShellToolbarTracker.cs (Android): when FlyoutBehavior is not Flyout, the non-flyout branch previously returned null for the icon image, ignoring BackButtonBehavior.IconOverride. The fix reads IconOverrideProperty directly in the non-flyout branch.
  • PR adds UITest: HostApp (Issue32050.xaml + .cs) and Appium test (Issue32050.cs in TestCases.Shared.Tests).
  • Prior agent review flagged: (1) PlatformAffected.iOS should be PlatformAffected.Android in HostApp code-behind; (2) UITestCategories.TitleView should be UITestCategories.Shell.
  • The HostApp XAML defines a Shell with navigation to a subpage, where BackButtonBehavior.IconOverride = "coffee.png" is set on the subpage.
  • Test uses VerifyScreenshot() to visually confirm the custom icon appears.

Fix Candidates

# Source Approach Test Result Files Changed Notes
PR PR #32080 When FlyoutBehavior != Flyout, read BackButtonBehavior.IconOverrideProperty instead of returning null ⏳ PENDING (Gate) ShellToolbarTracker.cs Original PR
🚦 Gate — Test Verification

Gate Result: ⚠️ SKIPPED

Platform: android
Mode: Full Verification

  • Tests FAIL without fix: ❌ Inconclusive (test execution hung after successful build/deploy)
  • Tests PASS with fix: ❌ Inconclusive (verification did not complete because the run remained hung)
  • Blocker: Android UI test verification environment was able to build and deploy Issue32050, but the isolated verification run did not produce final Appium/NUnit results.
  • Notes: Because the user requested autonomous execution with partial results over stopping, the review proceeds to mandatory Try-Fix with this gate recorded as blocked.

Gate Result: ✅ PASSED

Platform: android

# Type Test Name Filter
1 UITest IconOverrideInShellBackButtonBehaviorShouldWork Issue32050
Step Expected Actual Result
Without fix FAIL FAIL ✅
With fix PASS PASS ✅
🔧 Fix — Analysis & Comparison

Gate Result: ⚠️ SKIPPED

Platform: android
Mode: Full Verification

  • Tests FAIL without fix: ❌ Inconclusive (test execution hung after successful build/deploy)
  • Tests PASS with fix: ❌ Inconclusive (verification did not complete because the run remained hung)
  • Blocker: Android UI test verification environment was able to build and deploy Issue32050, but the isolated verification run did not produce final Appium/NUnit results.
  • Notes: Because the user requested autonomous execution with partial results over stopping, the review proceeds to mandatory Try-Fix with this gate recorded as blocked.

Fix Candidates

# Source Approach Test Result Files Changed Notes
1 try-fix (claude-opus-4.6) Refactor GetFlyoutIcon with searchParentHierarchy param so IconOverride is always checked ✅ PASS 1 file Centralizes icon resolution logic
2 try-fix (claude-sonnet-4.6) Extract dedicated GetBackButtonIcon method that checks IconOverride first, falls back to FlyoutIcon only when in flyout mode ✅ PASS 1 file Cleaner separation; leaves GetFlyoutIcon untouched
3 try-fix (gpt-5.3-codex) Apply IconOverride at the toolbar drawable assignment stage (later in UpdateLeftBarButtonItem) instead of changing the flyout ternary ✅ PASS 1 file Different insertion point; fixes at usage rather than selection
4 try-fix (gemini-3-pro-preview) Modify GetFlyoutIcon to check _flyoutBehavior internally and call it unconditionally from UpdateLeftBarButtonItem ✅ PASS 1 file Unconditional call; flyout logic inside helper
PR PR #32080 Read BackButtonBehavior.IconOverrideProperty inline in non-flyout branch ✅ PASSED (Gate) 1 impl + 3 test Original PR — most minimal fix

Cross-Pollination

Model Round New Ideas? Details
claude-opus-4.6 1 Yes Add computed EffectiveBackButtonIcon property in shared Shell core layer so all platforms consume one resolved value — architectural improvement, not a minimal regression fix
claude-sonnet-4.6 1 No NO NEW IDEAS
gpt-5.3-codex 1 Yes Add property-mapper change-listener that recomputes nav icon whenever IconOverride changes — good for future but larger than needed here
gemini-3-pro-preview 1 Yes Set ActionBarDrawerToggle.DrawerIndicatorEnabled = false when IconOverride detected — separate SyncState concern; explored in prior review

Exhausted: Yes (no actionable simpler alternatives; new ideas are larger architectural changes)
Selected Fix: PR's fix — it is the most minimal (1-line ternary change), precisely targets the regression point (where null was wrongly introduced in PR #29637), does not alter method signatures, and all alternative approaches add more code to achieve the same result. The PR's fix is correct, clear, and surgically precise.

📋 Report — Final Recommendation

Gate Result: ⚠️ SKIPPED

Platform: android
Mode: Full Verification

  • Tests FAIL without fix: ❌ Inconclusive (test execution hung after successful build/deploy)
  • Tests PASS with fix: ❌ Inconclusive (verification did not complete because the run remained hung)
  • Blocker: Android UI test verification environment was able to build and deploy Issue32050, but the isolated verification run did not produce final Appium/NUnit results.
  • Notes: Because the user requested autonomous execution with partial results over stopping, the review proceeds to mandatory Try-Fix with this gate recorded as blocked.

✅ Final Recommendation: APPROVE

Phase Status

Phase Status Notes
Pre-Flight ✅ COMPLETE Android regression in ShellToolbarTracker; 1 impl file + 3 test files
Gate ✅ PASSED android — tests FAIL without fix, PASS with fix
Try-Fix ✅ COMPLETE 4 attempts, all 4 passing; PR's fix selected as best
Report ✅ COMPLETE

Summary

PR #32080 correctly fixes a regression introduced in PR #29637 where BackButtonBehavior.IconOverride was ignored on Android when FlyoutBehavior is not Flyout. The fix is a single-line change that restores the expected behavior. Gate verification confirmed the test catches the bug and passes with the fix. All 4 try-fix model attempts also found passing solutions, but the PR's fix was the most minimal and precise of all candidates. Two test metadata issues were found (wrong platform attribute and category) that should be corrected before merge.

Root Cause

In UpdateLeftBarButtonItem (ShellToolbarTracker.cs), PR #29637 changed the non-flyout else branch to return null instead of calling GetFlyoutIcon. Since GetFlyoutIcon checks IconOverrideProperty first (before walking the flyout hierarchy), this change inadvertently dropped IconOverride support for non-flyout back navigation.

Fix Quality

The PR's fix is minimal, targeted, and correct:

  • 1-line change precisely at the regression point
  • Does not alter any method signatures
  • All 4 independent model attempts confirmed the same root cause and produced passing fixes — but all were more complex (new methods, parameter changes, post-processing) than the PR's inline approach
  • Minor test issues to address:
    1. PlatformAffected.iOS in Issue32050.xaml.cs should be PlatformAffected.Android — the bug and fix are Android-specific
    2. UITestCategories.TitleView in Issue32050.cs should be UITestCategories.Shell — this tests Shell back button behavior
    3. A baseline screenshot for IconOverrideInShellBackButtonBehaviorShouldWork must be added to the PR (was auto-generated during Gate verification and committed to the review branch)

@MauiBot MauiBot added s/agent-changes-requested AI agent recommends changes - found a better alternative or issues s/agent-fix-win AI found a better alternative fix than the PR s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review) labels Mar 22, 2026
@kubaflo kubaflo changed the base branch from main to inflight/current March 23, 2026 00:05
@kubaflo
Copy link
Copy Markdown
Contributor Author

kubaflo commented Mar 23, 2026

/azp run maui-pr-uitests

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Mar 23, 2026

Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Mar 23, 2026
Open
Closed
@MauiBot MauiBot added s/agent-approved AI agent recommends approval - PR fix is correct and optimal s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates and removed s/agent-changes-requested AI agent recommends changes - found a better alternative or issues s/agent-fix-win AI found a better alternative fix than the PR labels Mar 26, 2026
@kubaflo
Copy link
Copy Markdown
Contributor Author

kubaflo commented Mar 26, 2026

/azp run maui-pr-uitests

@Larhei
Copy link
Copy Markdown

Larhei commented Mar 27, 2026

Is there any plan when this is merged and public available?

@kubaflo
Copy link
Copy Markdown
Contributor Author

kubaflo commented Mar 27, 2026

/azp run maui-pr-uitests

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Mar 27, 2026

Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Mar 27, 2026
Open
Open
Open
Open
Open
@kubaflo kubaflo merged commit 97020e5 into dotnet:inflight/current Mar 31, 2026
71 of 160 checks passed
PureWeen pushed a commit that referenced this pull request Apr 8, 2026
@kubaflo @PureWeen
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
2478270 
…er (#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: #29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
devanathan-vaithiyanathan pushed a commit to devanathan-vaithiyanathan/maui that referenced this pull request Apr 9, 2026
@kubaflo @devanathan-vaithiyanathan
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
a0739c2 
…er (dotnet#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: dotnet#29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes dotnet#32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
PureWeen pushed a commit that referenced this pull request Apr 14, 2026
@kubaflo @PureWeen
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
c567b45 
…er (#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: #29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
@PureWeen PureWeen mentioned this pull request Apr 14, 2026
Merged
devanathan-vaithiyanathan pushed a commit to Tamilarasan-Paranthaman/maui that referenced this pull request Apr 21, 2026
@kubaflo @devanathan-vaithiyanathan
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
90d6b1b 
…er (dotnet#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: dotnet#29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes dotnet#32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
Ahamed-Ali pushed a commit that referenced this pull request Apr 22, 2026
@kubaflo @Ahamed-Ali
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
43eef6d 
…er (#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: #29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
PureWeen pushed a commit that referenced this pull request Apr 22, 2026
@kubaflo @PureWeen
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
52f0b20 
…er (#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: #29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
PureWeen pushed a commit that referenced this pull request Apr 28, 2026
@kubaflo @PureWeen
[Android] Fixed back button icon selection logic in ShellToolbarTrack…
b6eaa30 
…er (#32080)

<!-- Please let the below note in for people that find this PR -->
> [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Updates the logic for selecting the back button icon to use the
IconOverride property when FlyoutBehavior is not Flyout. This ensures
the correct icon is displayed based on the current behavior.

Regressing PR: #29637

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #32050

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
PureWeen added a commit that referenced this pull request Apr 29, 2026
@PureWeen
April 14th, Candidate (#34885)
4c231e9 
## Blazor
- Fix: Filter precompressed RCL assets from MAUI Blazor Hybrid APKs by
@mattleibow in #33917
  <details>
  <summary>🔧 Fixes</summary>

- [.NET MAUI Blazor Hybrid App should not precompress
assets](#33773)
  </details>

- [Windows] Fix for Runtime error when closing external window with WPF
Webview Control by @BagavathiPerumal in
#34006
  <details>
  <summary>🔧 Fixes</summary>

- [Runtime error when closing external window with WPF Webview
Control](#32944)
  </details>

## Button
- [Android] ImageButton CornerRadius not being applied - fix by @kubaflo
in #30074
  <details>
  <summary>🔧 Fixes</summary>

- [ImageButton CornerRadius not being applied on
Android](#23854)
  </details>

- Fix Disabled visual state ignored when Button has locally-set
BackgroundColor/TextColor by @Dhivya-SF4094 in
#34444
  <details>
  <summary>🔧 Fixes</summary>

- [[regression/9.0] VisualState "Disabled" is not properly applied for
Button with custom
appearance](#34363)
  </details>

## CollectionView
- Fix CollectionView grid spacing updates for first row and column by
@KarthikRajaKalaimani in #34527
  <details>
  <summary>🔧 Fixes</summary>

- [[MAUI] I2_Vertical grid for horizontal Item Spacing and Vertical Item
Spacing - horizontally updating the spacing only applies to the second
column](#34257)
  </details>

- Fix CollectionView record struct selection on Windows by
@jeremy-visionaid in #33488

- [Android] Ensure disconnected ItemsViewHandler doesn't hold onto the
items source by @filipnavara in
#24610
  <details>
  <summary>🔧 Fixes</summary>

- [Crash on NullReferenceException with measurement cells in
CollectionView](#24304)
  </details>

- [Windows] Fixed VisualState Setters not working properly for
CollectionView by @Dhivya-SF4094 in
#27230
  <details>
  <summary>🔧 Fixes</summary>

- [VisualState Setters not working properly on Windows for a
CollectionView](#27086)
- [[regression/8.0.3] [Windows][CollectionView]Label Disappear when set
Style in
ContentPage.Resources](#19209)
- [[Windows] Label style defined as ContentPage Resource doesn't
propagate to
CollectionView](#18701)
  </details>

- [Windows] Fixed Margin doesn't work inside CollectionView EmptyView by
@Dhivya-SF4094 in #29897
  <details>
  <summary>🔧 Fixes</summary>

- [Margin doesn't work inside CollectionView
EmptyView](#8494)
  </details>

- [Android, Windows] Fix CarouselView PreviousPosition/PreviousItem
incorrect during animated ScrollTo() by @praveenkumarkarunanithi in
#34570
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] CurrentItemChangedEventArgs.PreviousItem and
PositionChangedEventArgs.PreviousPosition Not Updating Correctly When
Using ScrollTo or Setting
Position](#29544)
  </details>

- [iOS] CarouselView2: Update internal scroll indicators for
compositional layout by @SubhikshaSf4851 in
#33639
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Horizontal Scroll Bar Not Visible on CarouselView
(CV2)](#29390)
  </details>

- [CarouselViewHandler2] Fir fox CurrentItem does not work when
ItemSpacing is set by @SyedAbdulAzeemSF4852 in
#32135
  <details>
  <summary>🔧 Fixes</summary>

- [[CarouselViewHandler2] CurrentItem does not work when ItemSpacing is
set](#32048)
  </details>

- [iOS] Fix for Incorrect Scroll in Loop Mode When CurrentItem Is Not
Found in ItemsSource by @SyedAbdulAzeemSF4852 in
#32141
  <details>
  <summary>🔧 Fixes</summary>

- [[Android & iOS] Setting an invalid CurrentItem causes scroll to last
item in looped
CarouselView](#32139)
  </details>

- [Android] IndicatorView: Add TalkBack accessibility descriptions for
indicators by @praveenkumarkarunanithi in
#31775
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] IndicatorView does not convey correct accessibility
information](#31446)
  </details>

- [iOS, macOS] Fixed CollectionView KeepLastItemInView Not Updating
Correctly When Items Are Added Dynamically by @NanthiniMahalingam in
#32191
  <details>
  <summary>🔧 Fixes</summary>

- [[.NET10] I9 - Scroll_Position - "KeepLastItemInView" does not keep
the last item at the end of the displayed list when adding new
items.](#31825)
  </details>

- [Windows, Android] Resolved issue with dynamic Header/Footer
reassignment in CollectionView. by @prakashKannanSf3972 in
#28403
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows, Android] Toggling Header/Footer in CollectionView
Dynamically is not working](#27959)
- [CollectionView HeaderTemplate and FooterTemplate are not displayed
when ItemsSource is initially set to
null](#28337)
- [[Android] Header and Footer Not Visible in CollectionView When
EmptyView is Selected
First](#28351)
  </details>

- [Android] Fix CollectionView inside disabled RefreshView blocks scroll
by @Vignesh-SF3580 in #34702
  <details>
  <summary>🔧 Fixes</summary>

- [C6-The C6 page cannot scroll on Windows and Android
platforms.](#34666)
  </details>

- [Android] CollectionView: Fix SelectedItem visual state not applying
when re-selecting same item by @KarthikRajaKalaimani in
#31591
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView - SelectedItem visual state manager not
working](#20062)
  </details>

- [Windows] Fixed CollectionView.EmptyView can not be removed by setting
it to Null by @Dhivya-SF4094 in
#29487
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] CollectionView.EmptyView can not be removed by setting it
to Null](#18657)
- [[Windows] EmptyViewTemplate Not Working in
CarouselView](#29463)
- [EmptyViewTemplate does not do
anything](#18551)
- [[MAUI] I5_EmptyView - The data template selector cannot display the
correct string.](#23330)
  </details>

- [iOS] Support for IsSwipeEnabled on CarouselView2 by @kubaflo in
#29996
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] IsSwipeEnabled Not Working on CarouselView
(CV2)](#29391)
  </details>

- [iOS, MacOS] Fixed FlowDirection not working on Header/Footer in
CollectionView by @Dhivya-SF4094 in
#32775
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, MacOS] FlowDirection not working on Header/Footer in
CollectionView](#32771)
  </details>

- [iOS] CollectionView: Fix drag-and-drop reordering into empty groups
by @SuthiYuvaraj in #34151
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView Drag and Drop Reordering Can't Drop in Empty
Group](#12008)
  </details>

- [Android] CollectionView: Fix drag-and-drop reordering into empty
groups by @SuthiYuvaraj in #31867
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView Drag and Drop Reordering Can't Drop in Empty
Group](#12008)
  </details>

- [iOS] Fix vertical CarouselView MandatorySingle snapping on iOS by
@Vignesh-SF3580 in #34700
  <details>
  <summary>🔧 Fixes</summary>

- [CarouselView vertical snap points ignored on iOS with
Microsoft.Maui.Controls v10.0.20 (regression from
v9.0.120)](#33308)
  </details>

- [iOS26] Fix CarouselView scrolling to wrong item when navigating to
last item by @Vignesh-SF3580 in
#34013
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS 26] CarouselView does not scroll to the correct last
item](#33770)
  </details>

- Fixed the OnPlatform does not work for header property in Collection
view by @NanthiniMahalingam in #28935
  <details>
  <summary>🔧 Fixes</summary>

- [OnPlatform does not work in Header of
CollectionView](#25124)
  </details>

- [Android] [Candidate branch] Fix
VerifySelectedItemClearsOnNullAssignment,
CollectionViewSelectionShouldClear, SelectedItemVisualIsCleared UI test
failure on Android by @KarthikRajaKalaimani in
#34928

## DateTimePicker
- [iOS] Fix for DatePicker FlowDirection Not Working on iOS by
@SyedAbdulAzeemSF4852 in #30193
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] DatePicker FlowDirection Not Working on
iOS](#30065)
  </details>

## Drawing
- [Shapes] Line: Fix asymmetric Stretch.None path translation when
right/bottom edge overflows by @NirmalKumarYuvaraj in
#34385
  <details>
  <summary>🔧 Fixes</summary>

- [Line coordinates not computed
correctly](#11404)
- [Lines not drawing
correctly](#26961)
  </details>

- [Android] Fixed GraphicsView drawable is visible outside the canvas by
@NirmalKumarYuvaraj in #28353
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] GraphicsView， The drawn image can also be visible outside
the canvas](#20834)
  </details>

- Fixed Custom Drawable does not support binding by @NirmalKumarYuvaraj
in #29442
  <details>
  <summary>🔧 Fixes</summary>

- [Custom IDrawable control does not databind to a model property when
used inside a CollectionView
ItemTemplate](#20991)
  </details>

- Added a support for GradientBrushes on Shape.Stroke by @kubaflo in
#22208
  <details>
  <summary>🔧 Fixes</summary>

- [GradientBrushes are not supported on
Shape.Stroke](#21983)
  </details>

## Editor
- Fixed Editor HorizontalTextAlignment does not update at run time by
@NirmalKumarYuvaraj in #25129
  <details>
  <summary>🔧 Fixes</summary>

- [Editor HorizontalTextAlignment Does not
Works.](#10987)
- [[iOS/MacOs] Right-To-Left (RTL) alignment is not applied to Editor
placeholder](#30052)
  </details>

- [Windows] Fixed Entry Editor placeholder Text CharacterSpacing by
@SubhikshaSf4851 in #30324
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] CharacterSpacing not applied to Placeholder text in Entry
and Editor controls](#30071)
  </details>

## Entry
- [Windows] Fix fo setting an Entry's Keyboard to Date causes it to be
interpreted as a password input by @SyedAbdulAzeemSF4852 in
#29344
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Entry Keyboad-Type "Date" results in
Password-Entry](#28975)
  </details>

- [Android] Exception thrown when give more than 5000 characters to the
Text property of Entry. by @KarthikRajaKalaimani in
#30242
  <details>
  <summary>🔧 Fixes</summary>

- [Android crash when Entry has >5000
characters](#30144)
  </details>

## Essentials
- Bump MonoApiToolsMSBuildTasksPackageVersion to 0.5.0 and ship
Essentials.AI public APIs by @mattleibow via @Copilot in
#34574

- [Mac] DeviceDisplay.KeepScreenOn not being respected on Mac OS by
@HarishwaranVijayakumar in #32708
  <details>
  <summary>🔧 Fixes</summary>

- [[Mac Catalyst] DeviceDisplay.KeepScreenOn not being respected on Mac
OS](#26059)
  </details>

## Flyoutpage
- [Windows] FlyoutPage: update CollapseStyle at runtime by
@devanathan-vaithiyanathan in #29927
  <details>
  <summary>🔧 Fixes</summary>

- [Flyout Page SetCollapseStyle doesn't have any
change](#18200)
  </details>

## Gestures
- [Android] Fix for TapGestureRecognizer doesn't fire by
@HarishwaranVijayakumar in #34497
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] TapGestureRecognizer doesn't
fire](#5825)
  </details>

## Image
- [Android] Fix Share.RequestAsync SecurityException on Android 10+
caused by missing ClipData by @HarishwaranVijayakumar in
#34417
  <details>
  <summary>🔧 Fixes</summary>

- [[Bug] Share.RequestAsync throws java.lang.SecurityException
(uid=1000) on Android 10+ due to missing
intent.ClipData](#34370)
  </details>

- [Windows]Fixed the MauiImage with logical name containing path issue
by @sheiksyedm in #32864
  <details>
  <summary>🔧 Fixes</summary>

- [MauiImage with LogicalName containing path - is not working on
Windows](#32356)
  </details>

- [Android, Windows & iOS] Fix Downsize/ScaleImage to maintain aspect
ratio and prevent upscaling by @SyedAbdulAzeemSF4852 in
#30808
  <details>
  <summary>🔧 Fixes</summary>

- [[Android & Windows] In GraphicsView, the aspect ratio is not
maintained when Downsize is called with both maxWidth and
maxHeight](#30803)
  </details>

## Label
- [iOS , macOS] Fixed Label text cropping when a width request is
specified on the label inside a VerticalStackLayout with specified width
request by @NanthiniMahalingam in
#29166
  <details>
  <summary>🔧 Fixes</summary>

- [Label text gets cropped when a width request is specified on the
label inside a
VerticalStackLayout](#28660)
- [[iOS] Label with a fixed WidthRequest has wrong
height](#26644)
  </details>

- [Android] Fix Label word wrapping clips text depending on alignment
and layout options by @Dhivya-SF4094 in
#34533
  <details>
  <summary>🔧 Fixes</summary>

- [Bug: Android Label word wrapping clips text depending on alignment
and layout options](#34459)
  </details>

- LineHeight and decorations for HTML Label - fix by @kubaflo in
#31202
  <details>
  <summary>🔧 Fixes</summary>

- [LineHeight with HTML Label not
working](#22193)
  - [lineheight is broken ](#22197)
  </details>

- [iOS] Fix Label with TailTruncation not rendering after
empty-to-non-empty text transition by @kubaflo in
#34812
  <details>
  <summary>🔧 Fixes</summary>

- [Label with LineBreakMode="TailTruncation" does not render text if
initial Text is null or empty on first render
(iOS)](#34591)
  </details>

## Layout
- [Android] Fix overflowing children clipped when parent Opacity < 1 by
@SyedAbdulAzeemSF4852 in #34565
  <details>
  <summary>🔧 Fixes</summary>

- [Maui Android parent view inappropriately creates clipping mask when
its opacity is less than 1, cropping out
children](#22038)
  </details>

- Fixed the FlexLayout reverse issue with the AlignContent by
@Ahamed-Ali in #32134
  <details>
  <summary>🔧 Fixes</summary>

- [FlexLayout alignment issue when Wrap is set to Reverse and
AlignContent is set to SpaceAround, SpaceBetween or
SpaceEvenly](#31565)
  </details>

- [iOS/Mac] Fixed BoxView in AbsoluteLayout did not return to its
default AutoSize for Height and Width after reset by @Dhivya-SF4094 in
#31648
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, Catalyst] BoxView in AbsoluteLayout does not return to default
AutoSize for Height/Width after
reset](#31496)
  </details>

## Map
- [Windows] Implement WinUI 3 MapControl handler using Azure Maps by
@jfversluis in #34138

## Modal
- [Android] PopToRootAsync for modal pages - improvements by @kubaflo in
#26851
  <details>
  <summary>🔧 Fixes</summary>

- [Shell PopToRootAsync doesn't happen instantly - previous pages flash
quickly. Only happens in NET
9](#26846)
  </details>

- [Android] Fix HideSoftInputOnTapped doesn't work on Modal Pages by
@HarishwaranVijayakumar in #34770
  <details>
  <summary>🔧 Fixes</summary>

- [HideSoftInputOnTapped doesn't work on Modal
Pages](#34730)
  </details>

## Navigation
- [iOS] Alert popup may be displayed on wrong window when modal page
navigation is in progress - fix by @kubaflo in
#31016
  <details>
  <summary>🔧 Fixes</summary>

- [Alert popup may be displayed on wrong window when modal page
navigation is in progress on
iOS/MacOS](#30970)
  </details>

- [Android] Page: Fix OnNavigatedTo called twice when NavigationPage is
FlyoutPage Detail by @KarthikRajaKalaimani in
#31931
  <details>
  <summary>🔧 Fixes</summary>

- [NavigationPage and FlyoutPage both call OnNavigatedTo, so it is
called twice](#23902)
  </details>

## Picker
- Fixed the Picker didn't dismiss it when tapping outside on iOS and
MacCatalyst platform. by @KarthikRajaKalaimani in
#30067
  <details>
  <summary>🔧 Fixes</summary>

- [[regression/8.0.3] iOS Picker dismiss does not work when clicking
outside of the Picker](#19168)
  </details>

- [Windows] Fixed Picker items width wont resize back by
@SubhikshaSf4851 in #33042
  <details>
  <summary>🔧 Fixes</summary>

- [Picker items width won't resize back when its container window gets
resized down.](#32984)
  </details>

## RadioButton
- Fix TalkBack not correctly narrating RadioButtons with Content by
@SubhikshaSf4851 in #34521
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] TalkBack does not correctly narrate RadioButtons with
Content](#34322)
  </details>

## SafeArea
- [Android] Fix SafeAreaShouldWorkOnAllShellTabs test failure on API 36
by @praveenkumarkarunanithi in #34239

## ScrollView
- [iOS] Preserve ScrollView offsets when Orientation changes to Neither
by @Vignesh-SF3580 in #34672
  <details>
  <summary>🔧 Fixes</summary>

- [Incorrect implementation of
ScrollView.Orientation](#34583)
  </details>

## Searchbar
- [Android] Fix SearchBar text bleeding between instances after
navigation by @SyedAbdulAzeemSF4852 in
#34703
  <details>
  <summary>🔧 Fixes</summary>

- [MAUI Android: SearchBar copies content from one to the
other](#20348)
  </details>

- Fixed SearchBar CursorPosition and SelectionLength not updating when
typing by @Dhivya-SF4094 in #34347
  <details>
  <summary>🔧 Fixes</summary>

- [SearchBar - CursorPosition and SelectionLength are not updated when
the user types](#30779)
  </details>

## SearchBar
- [Windows] Fixed SearchHandler issues by @Tamilarasan-Paranthaman in
#29520
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] SearchHandler APIs are not functioning
properly](#29493)
  </details>

## Shell
- [iOS, Mac] Fix for Background set to Transparent doesn't have the same
behavior as BackgroundColor Transparent by @HarishwaranVijayakumar in
#32245
  <details>
  <summary>🔧 Fixes</summary>

- [Background set to Transparent doesn't have the same behavior as
BackgroundColor =
Transparent](#22769)
  </details>

- [iOS] Fix App crash with NullReferenceException in
ShellSectionRenderer by @devanathan-vaithiyanathan in
#32109
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] App crash with NullReferenceException in
ShellSectionRenderer](#31961)
  </details>

- [Android] Fixed back button icon selection logic in
ShellToolbarTracker by @kubaflo in
#32080
  <details>
  <summary>🔧 Fixes</summary>

- [IconOverride in Shell.BackButtonBehavior does not
work.](#32050)
  </details>

- Fix TabBarIsVisible Not Updating Dynamically When Set on ShellContent
by @Vignesh-SF3580 in #33090
  <details>
  <summary>🔧 Fixes</summary>

- [Shell.TabBarIsVisible is not updated dynamically at
runtime](#32994)
  </details>

- [iOS, macOS] Shell: Fix RTL flow direction for flyout, menu cells, tab
bar, and Locked flyout position by @NanthiniMahalingam in
#32701
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, Mac Catalyst] Shell Flyout and Content Do Not Fully Support
RightToLeft (RTL)](#32419)
  </details>

- [IOS] Inconsistent Resize Behavior for Header/Footer - fix by @kubaflo
in #28713
  <details>
  <summary>🔧 Fixes</summary>

- [[IOS, Mac] Inconsistent Resize Behavior for
Header/Footer](#26397)
- [Enable Shell Flyout Header/Footer resize tests on
iOS/Catalyst](#33501)
  </details>

- [Android] Fix for SearchHandler retaining previous page SearchView
data in pages within Shell sections by @BagavathiPerumal in
#29545
  <details>
  <summary>🔧 Fixes</summary>

- [[Shell][Android] The truth is out there...but not on top tab search
handlers](#8716)
  </details>

- [Android] Fix empty space above TabBar after navigating back when
TabBar visibility is toggled by @praveenkumarkarunanithi in
#34324
  <details>
  <summary>🔧 Fixes</summary>

- [Empty space appears above TabBar after navigating back when TabBar
visibility is toggled](#33703)
- [Grid with SafeAreaEdges=Container has incorrect size when tab bar
appears](#34256)
  </details>

## SwipeView
- [Android] SwipeView: Use MeasureSpecMode.Exactly for SwipeItem layout
to fix text visibility by @Ahamed-Ali in
#27399
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Right SwipeView items are not visible in the
SwipeView.](#27367)
  </details>

- [Android] Prevent the tap that closes an open SwipeView from being
propagated to children by @sjordanGSS in
#24275
  <details>
  <summary>🔧 Fixes</summary>

- [Tapping to close a SwipeView will activate TapGestureRecognizers on
.Content](#23921)
  </details>

## Switch
- [iOS & Mac] Fix for SearchHandler retains previous page state when
switching top tabs by @BagavathiPerumal in
#34735
  <details>
  <summary>🔧 Fixes</summary>

- [[Shell] [iOS & Mac] SearchHandler retains previous page state when
switching top tabs](#34693)
  </details>

## TabbedPage
- [Android] Fixed NullReferenceException in app with TabBar after
returning from minimized state by @NirmalKumarYuvaraj in
#34779
  <details>
  <summary>🔧 Fixes</summary>

- [NullReferenceException in app with TabBar after returning from
minimized state](#34720)
  </details>

## Titlebar
- Fixed BindingContext of the Window TitleBar is not being passed on to
its child content. by @NirmalKumarYuvaraj in
#30080
  <details>
  <summary>🔧 Fixes</summary>

- [The BindingContext of the Window TitleBar is not being passed on to
its child content.](#24831)
  </details>

- [Windows/Mac] Fix RTL FlowDirection causes overlap with native window
control buttons in TitleBar by @devanathan-vaithiyanathan in
#30400
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows, Mac] RTL FlowDirection causes overlap with native window
control buttons in
TitleBar](#30399)
  </details>

## WebView
- [Windows] Fix WebView background color not being applied by
@SubhikshaSf4851 in #34599
  <details>
  <summary>🔧 Fixes</summary>

- [WebView background color has changed after update, can't
override.](#34518)
  </details>

- [Android] Fix for WebView/HybridWebView briefly flashes full screen
before layout completes by @praveenkumarkarunanithi in
#33207
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] HybridWebView briefly resizes to full screen when page is
opened before snapping back to correct
size](#31475)
  </details>

## Xaml
- Improved style inheritance by @kubaflo in
#31317
  <details>
  <summary>🔧 Fixes</summary>

- [Styles based on a style that is based on another style that uses
AppThemeBinding do not inherit properties
correctly.](#31280)
  </details>

- Fix for VisualStateManager Setter.TargetName failing when
ControlTemplate is applied by @BagavathiPerumal in
#33208
  <details>
  <summary>🔧 Fixes</summary>

- [Setter.TargetName + ControlTemplate
crash](#26977)
  </details>


<details>
<summary>🧪 Testing (4)</summary>

- [Testing] Additional Feature Matrix Event Test Cases for Slider and
ScrollView by @nivetha-nagalingam in
#34352
- [Testing] Fixed Build error on inflight/ candidate PR 34885 by
@NafeelaNazhir in #34891
- [Testing] Fixed UI test image failure in PR 34885 - [13/4/2026] by
@NafeelaNazhir in #34933
- Fixed test failure - CursorPositionUpdatesWhenSearchBarGainsFocus by
@Dhivya-SF4094 in #34938

</details>

<details>
<summary>📦 Other (3)</summary>

- Fix Loaded event not called for MAUI View added to native View by
@NirmalKumarYuvaraj in #34345
  <details>
  <summary>🔧 Fixes</summary>

- [Loaded event not called for MAUI View added to native
View](#34310)
  </details>
- Add public IAlertManager and IAlertManagerSubscription interfaces by
@Redth in #34228
  <details>
  <summary>🔧 Fixes</summary>

- [Alert/Dialog system (`DisplayAlert`, `DisplayActionSheet`,
`DisplayPromptAsync`) needs a public extensibility
point](#34104)
  </details>
- Fix crash when displaying alerts on unloaded pages by @kubaflo in
#33288

</details>

<details>
<summary>📝 Issue References</summary>

Fixes #5825, Fixes #8494, Fixes #8716, Fixes #10987, Fixes #11404, Fixes
#12008, Fixes #18200, Fixes #18551, Fixes #18657, Fixes #18701, Fixes
#19168, Fixes #19209, Fixes #20062, Fixes #20348, Fixes #20834, Fixes
#20991, Fixes #21983, Fixes #22038, Fixes #22193, Fixes #22197, Fixes
#22769, Fixes #23330, Fixes #23854, Fixes #23902, Fixes #23921, Fixes
#24304, Fixes #24831, Fixes #25124, Fixes #26059, Fixes #26397, Fixes
#26644, Fixes #26846, Fixes #26961, Fixes #26977, Fixes #27086, Fixes
#27367, Fixes #27959, Fixes #28337, Fixes #28351, Fixes #28660, Fixes
#28975, Fixes #29390, Fixes #29391, Fixes #29463, Fixes #29493, Fixes
#29544, Fixes #30052, Fixes #30065, Fixes #30071, Fixes #30144, Fixes
#30399, Fixes #30779, Fixes #30803, Fixes #30970, Fixes #31280, Fixes
#31446, Fixes #31475, Fixes #31496, Fixes #31565, Fixes #31825, Fixes
#31961, Fixes #32048, Fixes #32050, Fixes #32139, Fixes #32356, Fixes
#32419, Fixes #32771, Fixes #32944, Fixes #32984, Fixes #32994, Fixes
#33308, Fixes #33501, Fixes #33703, Fixes #33770, Fixes #33773, Fixes
#34104, Fixes #34256, Fixes #34257, Fixes #34310, Fixes #34322, Fixes
#34363, Fixes #34370, Fixes #34459, Fixes #34518, Fixes #34583, Fixes
#34591, Fixes #34666, Fixes #34693, Fixes #34720, Fixes #34730

</details>

**Full Changelog**:
main...inflight/candidate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

+1 more reviewer

@jsuarezruiz jsuarezruiz jsuarezruiz requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@kubaflo kubaflo

Labels

area-controls-shell Shell Navigation, Routes, Tabs, Flyout community ✨ Community Contribution platform/android s/agent-approved AI agent recommends approval - PR fix is correct and optimal s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

IconOverride in Shell.BackButtonBehavior does not work.

5 participants

@kubaflo @jsuarezruiz @MauiBot @Larhei