Skip to content

[Android] Fix bottom safe area padding dropping to zero when keyboard is shown - #35084

Merged
kubaflo merged 11 commits into
dotnet:inflight/currentfrom
praveenkumarkarunanithi:fix-32871
May 14, 2026
Merged

[Android] Fix bottom safe area padding dropping to zero when keyboard is shown#35084
kubaflo merged 11 commits into
dotnet:inflight/currentfrom
praveenkumarkarunanithi:fix-32871

Conversation

@praveenkumarkarunanithi

Copy link
Copy Markdown
Contributor

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!

Root Cause

On Android, when the keyboard appears, GetSafeAreaForEdge() recalculates bottom padding for all views. The logic returns the keyboard height if the region includes the SoftInput flag; otherwise, it unconditionally returns 0.

Since Container and Default regions do not include the SoftInput flag, the navigation bar padding (72–126px depending on device) gets incorrectly removed. This causes bottom content to shift behind the keyboard and snap back when dismissed.

This return 0 behavior originated from the initial SafeAreaEdges implementation (PR #31022) as a design assumption, not as part of a specific fix. The equivalent iOS implementation does not exhibit this behavior.

Description of Change

Removed the unconditional return 0 fallback in GetSafeAreaForEdge() for the bottom edge when the keyboard is visible.

With this change:

  • Container and Default regions now preserve the original safe area (navigation bar padding)
  • SoftInput and All regions continue to return keyboard height as expected
  • None remains unchanged and continues to return 0

This ensures correct padding behavior without affecting existing scenarios.

Issues Fixed

Fixes #32871

Tested the behaviour in the following platforms

  • Android
  • Windows
  • iOS
  • Mac

Note: Native padding validation in the test case is specific to Android platform behavior.

Screenshots

Before Issue Fix After Issue Fix
BeforeFix.31.mov
AfterFix.38.mov

@github-actions

github-actions Bot commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

🚀 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 -- 35084

Or

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

@praveenkumarkarunanithi praveenkumarkarunanithi added platform/android area-safearea Issues/PRs that have to do with the SafeArea functionality labels Apr 22, 2026
@dotnet-policy-service dotnet-policy-service Bot added the partner/syncfusion Issues / PR's with Syncfusion collaboration label Apr 22, 2026
@sheiksyedm
sheiksyedm marked this pull request as ready for review April 22, 2026 11:07
Copilot AI review requested due to automatic review settings April 22, 2026 11:07

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes Android SafeAreaEdges bottom inset behavior when the IME (keyboard) is visible by ensuring non-SoftInput regions (e.g., Default, Container) keep their original bottom safe area (navigation bar) instead of dropping to 0, and adds a regression UI test case for issue #32871.

Changes:

  • Android: Remove the “keyboard showing => bottom inset = 0” fallback for non-SoftInput safe area regions.
  • Add a new HostApp reproduction page (Issue32871) that surfaces native bottom padding while toggling the keyboard.
  • Add an Android-only Appium/NUnit UI test validating bottom padding is preserved while the keyboard is shown.

Reviewed changes

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

File Description
src/Core/src/Platform/Android/SafeAreaExtensions.cs Keeps bottom safe area (nav bar inset) for non-SoftInput regions when the keyboard is visible.
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32871.cs Adds an Android-only regression UI test that checks native bottom padding doesn’t drop to 0 while IME is visible.
src/Controls/tests/TestCases.HostApp/Issues/Issue32871.cs Adds a HostApp issue page that displays native padding and configures soft input mode for the repro/test.

Comment on lines +34 to +42
Assert.That(App.WaitForKeyboardToShow(), Is.True,
"Keyboard must be visible to validate the fix.");

var paddingWhileKeyboard = App.FindElement("PaddingLabel").GetText() ?? "";
var bottomPaddingDuringKeyboard = ExtractBottomPadding(paddingWhileKeyboard);

Assert.That(bottomPaddingDuringKeyboard, Is.EqualTo(initialBottomPadding),
$"Bottom padding should be preserved while keyboard is showing. " +
$"Initial: {initialBottomPadding}px, During keyboard: {bottomPaddingDuringKeyboard}px.");

Copilot AI Apr 22, 2026

Copy link

Choose a reason for hiding this comment

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

The test shows the keyboard but never dismisses it. Leaving the soft keyboard open can interfere with subsequent UI tests running in the same app session (occluding elements, affecting taps/screenshots). Dismiss the keyboard at the end of the test (and optionally wait for it to hide) to return the app to a stable state.

Suggested change
Assert.That(App.WaitForKeyboardToShow(), Is.True,
"Keyboard must be visible to validate the fix.");
var paddingWhileKeyboard = App.FindElement("PaddingLabel").GetText() ?? "";
var bottomPaddingDuringKeyboard = ExtractBottomPadding(paddingWhileKeyboard);
Assert.That(bottomPaddingDuringKeyboard, Is.EqualTo(initialBottomPadding),
$"Bottom padding should be preserved while keyboard is showing. " +
$"Initial: {initialBottomPadding}px, During keyboard: {bottomPaddingDuringKeyboard}px.");
try
{
Assert.That(App.WaitForKeyboardToShow(), Is.True,
"Keyboard must be visible to validate the fix.");
var paddingWhileKeyboard = App.FindElement("PaddingLabel").GetText() ?? "";
var bottomPaddingDuringKeyboard = ExtractBottomPadding(paddingWhileKeyboard);
Assert.That(bottomPaddingDuringKeyboard, Is.EqualTo(initialBottomPadding),
$"Bottom padding should be preserved while keyboard is showing. " +
$"Initial: {initialBottomPadding}px, During keyboard: {bottomPaddingDuringKeyboard}px.");
}
finally
{
App.DismissKeyboard();
}

Copilot uses AI. Check for mistakes.
Comment on lines +104 to +111
grid.HandlerChanged += (s, e) =>
{
if (grid.Handler?.PlatformView is AView nativeView)
{
paddingLabel.Text = $"NativePadding: B={nativeView.PaddingBottom}";
nativeView.AddOnLayoutChangeListener(new LayoutListener(nativeView, paddingLabel));
}
};

Copilot AI Apr 22, 2026

Copy link

Choose a reason for hiding this comment

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

grid.HandlerChanged subscribes with a lambda and AddOnLayoutChangeListener(...) creates a listener instance that is never removed or disposed. If the handler changes (or the page is reopened), this can register multiple listeners and leak Java-side objects. Store the listener (and the handler-changed delegate) as fields, unsubscribe in CleanupPlatform, and call RemoveOnLayoutChangeListener + Dispose() on the listener.

Copilot uses AI. Check for mistakes.
Comment on lines +23 to +30
var initialPaddingText = App.FindElement("PaddingLabel").GetText() ?? "";
var initialBottomPadding = ExtractBottomPadding(initialPaddingText);

if (initialBottomPadding <= 0)
{
Assert.Ignore("Device has no navigation bar bottom inset — cannot validate this regression.");
return;
}

Copilot AI Apr 22, 2026

Copy link

Choose a reason for hiding this comment

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

ExtractBottomPadding returns -1 when parsing fails, but the test treats any <= 0 value as “no navigation bar inset” and ignores. This can mask real failures (e.g., if the label never updates or the text format changes). Consider asserting that parsing succeeded (e.g., >= 0) and only Assert.Ignore when the parsed bottom padding is exactly 0.

Copilot uses AI. Check for mistakes.
@MauiBot MauiBot added s/agent-changes-requested AI agent recommends changes - found a better alternative or issues 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) labels Apr 22, 2026

@kubaflo kubaflo left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Could you please review the ai's summary and copilot's suggestions?

@MauiBot MauiBot added s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates and removed s/agent-fix-win AI found a better alternative fix than the PR labels May 11, 2026
PureWeen and others added 3 commits May 13, 2026 13:25
### Context

Add ability for maintainers to trigger the AzDO PR review pipeline via
`/review` comment on PR

### Notes

- The workflow allways runs from main - so users cannot chage behavior
in their PRs
- Unprivileged users slash command is ignored
- The 'agentic-labeler.md‎' pipeline referenced in comments of this
pipeline is being added by dotnet#35382

### Tested execution:

- GitHub Actions run:
https://github.com/dotnet/maui/actions/runs/25163585137

- DevDiv pipeline run:
https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=13980704

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@dotnet dotnet deleted a comment from MauiBot May 14, 2026
@MauiBot

MauiBot commented May 14, 2026

Copy link
Copy Markdown
Collaborator

🤖 AI Summary

👋 @praveenkumarkarunanithi — new AI review results are available. Please review the latest session below.

📊 Review Sessioncb0e786 · Merge branch 'dotnet:main' into fix-32871 · 2026-05-14 10:05 UTC
🚦 Gate — Test Before & After Fix

Gate Result: ⚠️ ENV ERROR

Platform: ANDROID · Base: main · Merge base: 4f61d650

Test Without Fix (expect FAIL) With Fix (expect PASS)
🖥️ Issue32871 Issue32871 ⚠️ ENV ERROR ✅ PASS — 546s
🔴 Without fix — 🖥️ Issue32871: ⚠️ ENV ERROR · 1702s

(truncated to last 15,000 chars)

ndroid.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Xamarin.Android.Tasks.FastDeploy.InstallPackage(Boolean installed) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Xamarin.Android.Tasks.FastDeploy.InstallPackage(Boolean installed) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Xamarin.Android.Tasks.FastDeploy.RunInstall() [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]

Build FAILED.

/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010: Mono.AndroidTools.InstallFailedException: Unexpected install output: cmd: Failure calling service package: Broken pipe (32) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:  [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Mono.AndroidTools.Internal.AdbOutputParsing.CheckInstallSuccess(String output, String packageName) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Mono.AndroidTools.AndroidDevice.<>c__DisplayClass105_0.<InstallPackage>b__0(Task`1 t) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010: --- End of stack trace from previous location --- [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at System.Threading.Tasks.Task.ExecuteWithThreadLocal(Task& currentTaskSlot, Thread threadPoolThread) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010: --- End of stack trace from previous location --- [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at AndroidDeviceExtensions.PushAndInstallPackageAsync(AndroidDevice device, PushAndInstallCommand command, CancellationToken token) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at AndroidDeviceExtensions.PushAndInstallPackageAsync(AndroidDevice device, PushAndInstallCommand command, CancellationToken token) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Xamarin.Android.Tasks.FastDeploy.InstallPackage(Boolean installed) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Xamarin.Android.Tasks.FastDeploy.InstallPackage(Boolean installed) [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
/home/vsts/work/1/s/.dotnet/packs/Microsoft.Android.Sdk.Linux/36.1.2/tools/Xamarin.Android.Common.Debugging.targets(333,5): error ADB0010:    at Xamarin.Android.Tasks.FastDeploy.RunInstall() [/home/vsts/work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
    0 Warning(s)
    1 Error(s)

Time Elapsed 00:15:22.38
* daemon not running; starting now at tcp:5037
* daemon started successfully
  Determining projects to restore...
  All projects are up-to-date for restore.
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Graphics -> /home/vsts/work/1/s/artifacts/bin/Graphics/Debug/net10.0-android36.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Essentials -> /home/vsts/work/1/s/artifacts/bin/Essentials/Debug/net10.0-android36.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Core -> /home/vsts/work/1/s/artifacts/bin/Core/Debug/net10.0-android36.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /home/vsts/work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Maps -> /home/vsts/work/1/s/artifacts/bin/Maps/Debug/net10.0-android36.0/Microsoft.Maui.Maps.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Core -> /home/vsts/work/1/s/artifacts/bin/Controls.Core/Debug/net10.0-android36.0/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Foldable -> /home/vsts/work/1/s/artifacts/bin/Controls.Foldable/Debug/net10.0-android36.0/Microsoft.Maui.Controls.Foldable.dll
  Microsoft.AspNetCore.Components.WebView.Maui -> /home/vsts/work/1/s/artifacts/bin/Microsoft.AspNetCore.Components.WebView.Maui/Debug/net10.0-android36.0/Microsoft.AspNetCore.Components.WebView.Maui.dll
  Controls.Maps -> /home/vsts/work/1/s/artifacts/bin/Controls.Maps/Debug/net10.0-android36.0/Microsoft.Maui.Controls.Maps.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Xaml -> /home/vsts/work/1/s/artifacts/bin/Controls.Xaml/Debug/net10.0-android36.0/Microsoft.Maui.Controls.Xaml.dll
  Controls.TestCases.HostApp -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Controls.TestCases.HostApp.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Graphics -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Essentials -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Core -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /home/vsts/work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Core -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Maps -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Maps.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Microsoft.AspNetCore.Components.WebView.Maui -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.AspNetCore.Components.WebView.Maui.dll
  Controls.Maps -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.Maps.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Foldable -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.Foldable.dll
  Controls.Xaml -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.Xaml.dll

Build succeeded.
    0 Warning(s)
    0 Error(s)

Time Elapsed 00:09:00.65
Broadcasting: Intent { act=android.intent.action.CLOSE_SYSTEM_DIALOGS flg=0x400000 }
Broadcast completed: result=0
Broadcasting: Intent { act=android.intent.action.CLOSE_SYSTEM_DIALOGS flg=0x400000 }
Broadcast completed: result=0
  Determining projects to restore...
  Restored /home/vsts/work/1/s/src/TestUtils/src/VisualTestUtils/VisualTestUtils.csproj (in 1.53 sec).
  Restored /home/vsts/work/1/s/src/TestUtils/src/UITest.NUnit/UITest.NUnit.csproj (in 888 ms).
  Restored /home/vsts/work/1/s/src/TestUtils/src/UITest.Core/UITest.Core.csproj (in 6 ms).
  Restored /home/vsts/work/1/s/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj (in 1.52 sec).
  Restored /home/vsts/work/1/s/src/TestUtils/src/VisualTestUtils.MagickNet/VisualTestUtils.MagickNet.csproj (in 5.15 sec).
  Restored /home/vsts/work/1/s/src/TestUtils/src/UITest.Analyzers/UITest.Analyzers.csproj (in 2.42 sec).
  Restored /home/vsts/work/1/s/src/Controls/tests/CustomAttributes/Controls.CustomAttributes.csproj (in 4 ms).
  Restored /home/vsts/work/1/s/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj (in 1.68 sec).
  5 of 13 projects are up-to-date for restore.
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Graphics -> /home/vsts/work/1/s/artifacts/bin/Graphics/Debug/net10.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Essentials -> /home/vsts/work/1/s/artifacts/bin/Essentials/Debug/net10.0/Microsoft.Maui.Essentials.dll
  Controls.CustomAttributes -> /home/vsts/work/1/s/artifacts/bin/Controls.CustomAttributes/Debug/net10.0/Controls.CustomAttributes.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Core -> /home/vsts/work/1/s/artifacts/bin/Core/Debug/net10.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /home/vsts/work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Core -> /home/vsts/work/1/s/artifacts/bin/Controls.Core/Debug/net10.0/Microsoft.Maui.Controls.dll
  VisualTestUtils -> /home/vsts/work/1/s/artifacts/bin/VisualTestUtils/Debug/netstandard2.0/VisualTestUtils.dll
  UITest.Core -> /home/vsts/work/1/s/artifacts/bin/UITest.Core/Debug/net10.0/UITest.Core.dll
  UITest.NUnit -> /home/vsts/work/1/s/artifacts/bin/UITest.NUnit/Debug/net10.0/UITest.NUnit.dll
  UITest.Appium -> /home/vsts/work/1/s/artifacts/bin/UITest.Appium/Debug/net10.0/UITest.Appium.dll
  VisualTestUtils.MagickNet -> /home/vsts/work/1/s/artifacts/bin/VisualTestUtils.MagickNet/Debug/netstandard2.0/VisualTestUtils.MagickNet.dll
  UITest.Analyzers -> /home/vsts/work/1/s/artifacts/bin/UITest.Analyzers/Debug/netstandard2.0/UITest.Analyzers.dll
  Controls.TestCases.Android.Tests -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll
Test run for /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll (.NETCoreApp,Version=v10.0)
VSTest version 18.0.1 (x64)

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
/home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll
[xUnit.net 00:00:00.00] xUnit.net VSTest Adapter v2.8.2+699d445a1a (64-bit .NET 10.0.0)
[xUnit.net 00:00:00.12]   Discovering: Controls.TestCases.Android.Tests
[xUnit.net 00:00:00.43]   Discovered:  Controls.TestCases.Android.Tests
NUnit Adapter 4.5.0.0: Test execution started
Running selected tests in /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll
   NUnit3TestExecutor discovered 1 of 1 NUnit test cases using Current Discovery mode, Non-Explicit run
>>>>> 05/14/2026 09:26:10 FixtureSetup for Issue32871(Android)
>>>>> 05/14/2026 09:26:14 BottomPaddingShouldBePreservedWhileKeyboardIsShowing Start
>>>>> 05/14/2026 09:26:21 BottomPaddingShouldBePreservedWhileKeyboardIsShowing Stop
>>>>> 05/14/2026 09:26:23 Log types: logcat, bugreport, server
  Failed BottomPaddingShouldBePreservedWhileKeyboardIsShowing [10 s]
  Error Message:
     Bottom padding should be preserved while keyboard is showing. Initial: 126px, During keyboard: 0px.
Assert.That(bottomPaddingDuringKeyboard, Is.EqualTo(initialBottomPadding))
  Expected: 126.0d
  But was:  0.0d

  Stack Trace:
     at Microsoft.Maui.TestCases.Tests.Issues.Issue32871.BottomPaddingShouldBePreservedWhileKeyboardIsShowing() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32871.cs:line 40

1)    at Microsoft.Maui.TestCases.Tests.Issues.Issue32871.BottomPaddingShouldBePreservedWhileKeyboardIsShowing() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32871.cs:line 40


NUnit Adapter 4.5.0.0: Test execution complete

Total tests: 1
     Failed: 1
Test Run Failed.
 Total time: 43.1409 Seconds

🟢 With fix — 🖥️ Issue32871: PASS ✅ · 546s
  Determining projects to restore...
  All projects are up-to-date for restore.
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Graphics -> /home/vsts/work/1/s/artifacts/bin/Graphics/Debug/net10.0-android36.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Essentials -> /home/vsts/work/1/s/artifacts/bin/Essentials/Debug/net10.0-android36.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Core -> /home/vsts/work/1/s/artifacts/bin/Core/Debug/net10.0-android36.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /home/vsts/work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Maps -> /home/vsts/work/1/s/artifacts/bin/Maps/Debug/net10.0-android36.0/Microsoft.Maui.Maps.dll
  Controls.Core -> /home/vsts/work/1/s/artifacts/bin/Controls.Core/Debug/net10.0-android36.0/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Foldable -> /home/vsts/work/1/s/artifacts/bin/Controls.Foldable/Debug/net10.0-android36.0/Microsoft.Maui.Controls.Foldable.dll
  Controls.Xaml -> /home/vsts/work/1/s/artifacts/bin/Controls.Xaml/Debug/net10.0-android36.0/Microsoft.Maui.Controls.Xaml.dll
  Microsoft.AspNetCore.Components.WebView.Maui -> /home/vsts/work/1/s/artifacts/bin/Microsoft.AspNetCore.Components.WebView.Maui/Debug/net10.0-android36.0/Microsoft.AspNetCore.Components.WebView.Maui.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Maps -> /home/vsts/work/1/s/artifacts/bin/Controls.Maps/Debug/net10.0-android36.0/Microsoft.Maui.Controls.Maps.dll
  Controls.TestCases.HostApp -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Controls.TestCases.HostApp.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Graphics -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Essentials -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Core -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /home/vsts/work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Maps -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Maps.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Core -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Foldable -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.Foldable.dll
  Microsoft.AspNetCore.Components.WebView.Maui -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.AspNetCore.Components.WebView.Maui.dll
  Controls.Xaml -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.Xaml.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Maps -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-android/Microsoft.Maui.Controls.Maps.dll

Build succeeded.
    0 Warning(s)
    0 Error(s)

Time Elapsed 00:07:08.56
Broadcasting: Intent { act=android.intent.action.CLOSE_SYSTEM_DIALOGS flg=0x400000 }
Broadcast completed: result=0
Broadcasting: Intent { act=android.intent.action.CLOSE_SYSTEM_DIALOGS flg=0x400000 }
Broadcast completed: result=0
  Determining projects to restore...
  All projects are up-to-date for restore.
  Controls.CustomAttributes -> /home/vsts/work/1/s/artifacts/bin/Controls.CustomAttributes/Debug/net10.0/Controls.CustomAttributes.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Graphics -> /home/vsts/work/1/s/artifacts/bin/Graphics/Debug/net10.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Essentials -> /home/vsts/work/1/s/artifacts/bin/Essentials/Debug/net10.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Core -> /home/vsts/work/1/s/artifacts/bin/Core/Debug/net10.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /home/vsts/work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.80-ci+azdo.14096479
  Controls.Core -> /home/vsts/work/1/s/artifacts/bin/Controls.Core/Debug/net10.0/Microsoft.Maui.Controls.dll
  UITest.Core -> /home/vsts/work/1/s/artifacts/bin/UITest.Core/Debug/net10.0/UITest.Core.dll
  VisualTestUtils -> /home/vsts/work/1/s/artifacts/bin/VisualTestUtils/Debug/netstandard2.0/VisualTestUtils.dll
  UITest.NUnit -> /home/vsts/work/1/s/artifacts/bin/UITest.NUnit/Debug/net10.0/UITest.NUnit.dll
  VisualTestUtils.MagickNet -> /home/vsts/work/1/s/artifacts/bin/VisualTestUtils.MagickNet/Debug/netstandard2.0/VisualTestUtils.MagickNet.dll
  UITest.Appium -> /home/vsts/work/1/s/artifacts/bin/UITest.Appium/Debug/net10.0/UITest.Appium.dll
  UITest.Analyzers -> /home/vsts/work/1/s/artifacts/bin/UITest.Analyzers/Debug/netstandard2.0/UITest.Analyzers.dll
  Controls.TestCases.Android.Tests -> /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll
Test run for /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll (.NETCoreApp,Version=v10.0)
VSTest version 18.0.1 (x64)

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
/home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll
[xUnit.net 00:00:00.00] xUnit.net VSTest Adapter v2.8.2+699d445a1a (64-bit .NET 10.0.0)
[xUnit.net 00:00:00.16]   Discovering: Controls.TestCases.Android.Tests
[xUnit.net 00:00:00.66]   Discovered:  Controls.TestCases.Android.Tests
NUnit Adapter 4.5.0.0: Test execution started
Running selected tests in /home/vsts/work/1/s/artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0/Controls.TestCases.Android.Tests.dll
   NUnit3TestExecutor discovered 1 of 1 NUnit test cases using Current Discovery mode, Non-Explicit run
>>>>> 05/14/2026 09:35:56 FixtureSetup for Issue32871(Android)
>>>>> 05/14/2026 09:35:59 BottomPaddingShouldBePreservedWhileKeyboardIsShowing Start
>>>>> 05/14/2026 09:36:03 BottomPaddingShouldBePreservedWhileKeyboardIsShowing Stop
  Passed BottomPaddingShouldBePreservedWhileKeyboardIsShowing [4 s]
NUnit Adapter 4.5.0.0: Test execution complete

Test Run Successful.
Total tests: 1
     Passed: 1
 Total time: 21.0135 Seconds

⚠️ Failure Details

  • ⚠️ Issue32871 without fix: Exception calling "Matches" with "2" argument(s): "Value cannot be null. (Parameter 'input')"
📁 Fix files reverted (1 files)
  • src/Core/src/Platform/Android/SafeAreaExtensions.cs

🧪 UI Tests — SafeAreaEdges,ViewBaseTests

Detected UI test categories: SafeAreaEdges,ViewBaseTests

🧪 UI Test Execution Results

⏭️ SKIPPED — 0 passed, 0 failed, 2 skipped (platform: android)

Category Result Tests Duration Notes
SafeAreaEdges ⏭️ SKIPPED 0.4s Runner threw an exception
ViewBaseTests ⏭️ SKIPPED 0s Runner threw an exception

Failures here are informational only — they do not block the gate or affect try-fix candidate scoring.


🔍 Pre-Flight — Context & Validation

Issue: #32871 — [Android] Bottom insets issues when keyboard is shown
PR: #35084 — [Android] Fix bottom safe area padding dropping to zero when keyboard is shown
Platforms Affected: Android
Files Changed: 1 implementation (src/Core/src/Platform/Android/SafeAreaExtensions.cs), 2 test (Issue32871.cs HostApp + Shared.Tests)

Key Findings

  • Root cause: In SafeAreaExtensions.GetSafeAreaForEdge(...), when the keyboard is visible and the bottom edge's SafeAreaRegions does not include the SoftInput flag, the method unconditionally returned 0. For regions Default and Container, this collapsed the navigation-bar inset (72–126 px depending on device) to zero, causing bottom content (buttons, etc.) to either jump or be partially hidden when the keyboard appears/dismisses with WindowSoftInputModeAdjust=Unspecified/Pan.
  • PR's fix (minimal): Removes the four-line return 0; fallback that follows the IsSoftInput(...) check inside the isKeyboardShowing branch. Execution then falls through to return originalSafeArea; (the same statement used when keyboard is NOT showing). Result:
    • None → still returns 0 (early-return at top of method).
    • SoftInput only → returns keyBoardInsets.Bottom (unchanged).
    • SoftInput | X (anything including SoftInput, or All) → returns keyBoardInsets.Bottom (unchanged).
    • Default, Container (no SoftInput flag) → now returns originalSafeArea (previously 0).
  • Semantics: Aligns with the documented intent of Container ("flows under keyboard but stays out of top/bottom bars and notch") and matches iOS behavior, per PR author's note that return 0 was a design assumption from PR Implement SafeAreaEdges property and per-edge safe area control for Android #31022 not an intentional fix.
  • Test strategy: Android-only UI test (Issue32871) verifies native PaddingBottom is preserved across keyboard show. Uses a forced SoftInput.AdjustUnspecified | StateHidden window flag and a View.IOnLayoutChangeListener to read live padding. Skips on devices with originalBottomPadding <= 0 (no nav bar inset) — a robust gate against false negatives on gesture-nav devices.
  • Gate result: ✅ PASSED — test fails without fix, passes with fix.

Edge cases worth probing in alternatives

  1. Does removing the fallback change behavior for SafeAreaRegions.All when keyboard is showing? — No. IsSoftInput(All) == true so the earlier if already returns keyBoardInsets.Bottom.
  2. Does it change behavior for SafeAreaRegions.None? — No. The first if in the method short-circuits to 0.
  3. Could originalSafeArea ever be smaller than keyboard height in a way that introduces double-counting? — No, because if SoftInput is set we already returned the keyboard inset; the fall-through only fires for Default/Container, which conceptually want the nav-bar inset only.
  4. Does this affect non-bottom edges? — No. The whole block is inside if (edge == 3).

Code Review Summary

Verdict: LGTM (fix is minimal, semantically correct, well-targeted)
Confidence: medium-high
Errors: 0 | Warnings: 0 | Suggestions: 2

Key suggestions Try-Fix can explore:

  • 💡 Replace the silent fall-through with an explicit return originalSafeArea; inside the isKeyboardShowing branch and a comment documenting the Container/Default semantics — improves readability and prevents future regressions if more branches are added.
  • 💡 Optionally, factor the bottom-edge keyboard logic into a helper method (ResolveBottomEdgeWhenKeyboardShowing) to make region-specific behavior explicit and unit-testable.

Fix Candidates

# Source Approach Test Result Files Changed Notes
PR PR #35084 Remove return 0 fallback so Default/Container fall through to return originalSafeArea ✅ PASSED (Gate) SafeAreaExtensions.cs Minimal 4-line deletion

🔧 Fix — Analysis & Comparison

Try-Fix Aggregate — PR #35084

Three alternative fix candidates were generated using the maui-expert-reviewer agent, applied to src/Core/src/Platform/Android/SafeAreaExtensions.cs, build-verified for net10.0-android36.0, and traced against the gate test Issue32871.BottomPaddingShouldBePreservedWhileKeyboardIsShowing (which uses Grid.SafeAreaEdges = SafeAreaEdges.Default).

Summary

# Approach Build Gate test outcome Verdict vs PR
1 Explicit branch-table refactor (same behavior) ✅ PASS (equivalent) EQUIVALENT — cleaner code, same runtime semantics
2 Split Default (→ 0) from Container (→ originalSafeArea) ❌ FAIL (Default returns 0 → asserts 0 == 72px and fails) WORSE — misses the common-case bug
3 Math.Max(originalSafeArea, keyBoardInsets.Bottom) for non-SoftInput regions ❌ FAIL (Default returns ~keyboard height ≫ initial padding) WORSE — violates Container contract, over-corrects

Loop history (Generate → Test → Learn)

  1. Generate [Draft] Readme WIP #1 (refactor) — expert reviewer proposed an explicit decision-tree refactor.
    Test: Build OK. Trace for Default/keyboard/bottom → originalSafeArea (same as PR). Gate would pass.
    Learn: Refactor is value-add but doesn't change runtime behavior. Need a candidate exploring a semantic alternative.

  2. Generate Update README.md #2 (split Default vs Container) — proposed by expert as the semantically-tightest interpretation of SafeAreaRegions.cs doc strings.
    Test: Build OK. Trace for Default/keyboard/bottom → 0. Gate test (which uses Default) fails with assertion 0 != initial_navbar_padding.
    Learn: The gate test's chosen region is Default, which is the realistic user setting. Reverting Default to 0 regresses the user-visible bug. The semantic distinction is interesting but would require a parallel Default → Container remapping on Android to be useful. Need a candidate that fixes the bug more aggressively (not less).

  3. Generate Third #3 (max(navBar, keyboard)) — expert ranked this as "BETTER" arguing the PR only pads to nav-bar height while keyboards are much larger.
    Test: Build OK. Trace for Default/keyboard/bottom → ~700px (keyboard). Gate asserts ~700 == 72 → fail.
    Learn: Re-reading the issue ([Android] Bottom insets issues when keyboard is shown. #32871) and the gate test confirms the bug is the jump caused by the inset collapsing to 0, not the button being hidden behind the keyboard. The user explicitly chose Default/Container so content would flow under the keyboard while preserving the nav-bar margin. max(...) pushes content above the keyboard, which is what SafeAreaRegions.SoftInput is for — not what the user requested. The expert reviewer's "BETTER" claim was based on misreading the bug as a visibility issue.

Stopping rationale

Three meaningfully different alternatives have been exhausted:

  • Structural alternative (Candidate 1): equivalent and serves as a low-risk follow-up.
  • Conservative semantic alternative (Candidate 2): keeps Default historical, fixes only Container. Misses the bug.
  • Aggressive semantic alternative (Candidate 3): pushes content above the keyboard for all non-SoftInput regions. Violates contracts.

Any further alternatives would either be trivial variations (e.g., reordering branches) or would require broader product decisions (remap DefaultContainer, redefine SafeAreaRegions enum semantics, change iOS implementation to match). Those are out of scope for a bug-fix backport.

Recommendation

Keep the PR's minimal-deletion fix. The PR correctly addresses the reported bug with the smallest possible change and the broadest correctness for Default/Container regions while keyboard is showing.

Optional follow-up: Land Candidate 1's explicit decision-tree refactor in a separate PR to improve maintainability and prevent future fall-through regressions when new SafeAreaRegions values or branches are added.

Per-candidate output


📋 Report — Final Recommendation

Comparative Report — PR #35084

Issue: #32871 — [Android] Bottom insets issues when keyboard is shown
Gate test: Issue32871.BottomPaddingShouldBePreservedWhileKeyboardIsShowing (Android UI; uses SafeAreaEdges.Default)
Gate result (PR fix as submitted): ✅ PASSED (test fails without fix, passes with fix)

Candidate matrix

# Candidate Source / Approach Build Regression test (gate) Code-quality / future-proofing Verdict
1 pr The PR as submitted: 4-line deletion of the return 0; fallback in GetSafeAreaForEdge's isKeyboardShowing branch. Default/Container now fall through to return originalSafeArea;. ✅ PASS Minimal & correct, but the load-bearing fall-through is implicit and a future reader could re-introduce the bug by "tidying up" the orphaned if (isKeyboardShowing) { … } block. Strong (winner candidate)
2 pr-plus-reviewer PR + expert reviewer's two suggestion-level cleanups applied to the same file: (a) flatten the now-vestigial nested if (isKeyboardShowing) { if (IsSoftInput…) } into a single combined predicate; (b) add an inline comment at the surviving return originalSafeArea; naming #32871 so the fall-through is no longer "dead-looking" code. No behavioral change. ✅ (Build succeeded. 0 Warning(s) 0 Error(s)) ✅ PASS (truth-table identical to pr across all 7 region/keyboard combos; gate trace: Default + keyboard-on → originalSafeArea) Strictly better than pr on maintainability: makes the contract explicit, prevents accidental re-regression of #32871, no perf or API impact. WINNER
3 try-fix-1 Explicit decision-tree refactor of GetSafeAreaForEdge: every region's outcome is on its own named branch (None → 0, edge != 3 → original, wantsSoftInput && keyboard → keyboard, onlySoftInput → 0, else original). ✅ PASS (equivalent to PR — truth table matches) Slightly bigger rewrite than pr-plus-reviewer; introduces locals wantsSoftInput/onlySoftInput. Reasonable follow-up but larger blast radius than necessary for the bug fix. Equivalent in behavior, larger diff
4 try-fix-2 Split Default (→ 0) from Container (→ originalSafeArea) when keyboard showing on bottom. FAILDefault regresses (0 != initial_navbar_padding). Semantically tighter but misses the common-case (Default is the implicit/zero-config setting). Would need a parallel Default → Container remap on Android to fix the bug. Worse — regresses gate
5 try-fix-3 Math.Max(originalSafeArea, keyBoardInsets.Bottom) for non-SoftInput regions when keyboard showing. FAIL~700 px != ~72 px on Default. Misreads the bug (issue is "jump to 0", not "button hidden behind keyboard"); violates Container's documented "Content flows under keyboard" contract; over-pads All on tablets w/ partial keyboards. Worse — regresses gate, violates region contracts

Ranking (gate-passing first, per task requirement)

  1. pr-plus-reviewer — ✅ gate, ✅ improved maintainability over pr (winner)
  2. pr — ✅ gate, minimal but implicit fall-through is a re-regression risk
  3. try-fix-1 — ✅ gate, equivalent behavior, larger diff than needed
  4. try-fix-2 — ❌ gate (must rank below all gate-passers per requirement)
  5. try-fix-3 — ❌ gate (must rank below all gate-passers per requirement)

Why pr-plus-reviewer wins over pr

Both produce identical runtime behavior and both pass the gate (verified via behavioral truth-table across None, SoftInput-only, All, Default, Container × keyboard on/off, and edge != 3). The difference is purely code-clarity:

  1. Eliminates a vestigial nested if. After the PR's deletion, the if (isKeyboardShowing) { if (IsSoftInput…) return keyboard; } block has a single early-return inside an otherwise empty wrapper — a shape that invites a future "cleanup" PR that would silently re-introduce the bug by removing the wrapper and unintentionally short-circuiting Default/Container. The reviewer collapses it to if (isKeyboardShowing && IsSoftInput(region)) which has no hidden control flow.
  2. Documents the load-bearing fall-through. The terminal return originalSafeArea; is now the primary path for the Default/Container keyboard-up case (the whole point of the fix). Adding a comment citing [Android] Bottom insets issues when keyboard is shown. #32871 turns it from "looks like generic default" into "documented regression fence."
  3. Zero behavioral or API risk. No new public API, no platform changes outside Android, no thread-affinity changes; build is clean (0 warnings, 0 errors); gate test path is the same.

Why try-fix-1 did not win despite passing

try-fix-1 is also a quality improvement, but it is a larger rewrite (≈25 lines changed vs ≈10 in pr-plus-reviewer) that introduces new locals (wantsSoftInput, onlySoftInput) and re-orders branches. For a backport-friendly bug fix, the smaller, more conservative pr-plus-reviewer diff is preferred. try-fix-1 is recorded in the try-fix log as a recommended follow-up cleanup PR.

Why try-fix-2 and try-fix-3 are disqualified

Both were verified by trace and (in try-fix-3's case) reasoning about typical Android device insets to fail the gate test. Per the task's explicit rule ("Candidates that failed regression tests MUST be ranked lower than candidates that passed them"), they are ranked below all gate-passing candidates regardless of any other merits.

Recommendation

Recommend the PR with the reviewer's two cleanup suggestions applied (pr-plus-reviewer). The behavioral change is the PR's; the cleanup is small, mechanical, and prevents accidental re-regression. If the maintainer prefers an absolutely minimal diff for backport, fall back to pr as-is (also acceptable). The expert reviewer raised 0 errors and 0 warnings — all 5 findings were suggestion-level, so neither candidate is a "blocker."


@kubaflo
kubaflo changed the base branch from main to inflight/current May 14, 2026 11:20
@kubaflo
kubaflo merged commit a51ef1e into dotnet:inflight/current May 14, 2026
2 of 11 checks passed
@github-actions github-actions Bot added this to the .NET 10.0 SR8 milestone May 14, 2026
@kubaflo kubaflo added s/agent-changes-requested AI agent recommends changes - found a better alternative or issues and removed s/agent-review-incomplete labels May 20, 2026
PureWeen pushed a commit that referenced this pull request Jun 2, 2026
… is shown (#35084)

<!-- 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!

### Root Cause
On Android, when the keyboard appears, `GetSafeAreaForEdge()`
recalculates bottom padding for all views. The logic returns the
keyboard height if the region includes the `SoftInput` flag; otherwise,
it unconditionally returns `0`.

Since `Container` and `Default` regions do not include the `SoftInput`
flag, the navigation bar padding (72–126px depending on device) gets
incorrectly removed. This causes bottom content to shift behind the
keyboard and snap back when dismissed.

This `return 0` behavior originated from the initial SafeAreaEdges
implementation (PR #31022) as a design assumption, not as part of a
specific fix. The equivalent iOS implementation does not exhibit this
behavior.

### Description of Change
Removed the unconditional `return 0` fallback in `GetSafeAreaForEdge()`
for the bottom edge when the keyboard is visible.

With this change:

* `Container` and `Default` regions now preserve the original safe area
(navigation bar padding)
* `SoftInput` and `All` regions continue to return keyboard height as
expected
* `None` remains unchanged and continues to return `0`

This ensures correct padding behavior without affecting existing
scenarios.

### Issues Fixed
Fixes #32871

Tested the behaviour in the following platforms
- [x] Android
- [ ] Windows
- [x] iOS
- [ ] Mac

**Note: Native padding validation in the test case is specific to
Android platform behavior.**

### Screenshots
| Before Issue Fix | After Issue Fix |
|------------------|-----------------|
| <video width="350" alt="withoutfix"
src="https://github.com/user-attachments/assets/ca528d7c-df1a-4559-b61c-c5716080a9d5"
/> | <video width="350" alt="withfix"
src="https://github.com/user-attachments/assets/53fab288-bc60-4d9d-abde-3e7022ac29e1"
/> |

---------
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
PureWeen pushed a commit that referenced this pull request Jun 11, 2026
… is shown (#35084)

<!-- 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!

### Root Cause
On Android, when the keyboard appears, `GetSafeAreaForEdge()`
recalculates bottom padding for all views. The logic returns the
keyboard height if the region includes the `SoftInput` flag; otherwise,
it unconditionally returns `0`.

Since `Container` and `Default` regions do not include the `SoftInput`
flag, the navigation bar padding (72–126px depending on device) gets
incorrectly removed. This causes bottom content to shift behind the
keyboard and snap back when dismissed.

This `return 0` behavior originated from the initial SafeAreaEdges
implementation (PR #31022) as a design assumption, not as part of a
specific fix. The equivalent iOS implementation does not exhibit this
behavior.

### Description of Change
Removed the unconditional `return 0` fallback in `GetSafeAreaForEdge()`
for the bottom edge when the keyboard is visible.

With this change:

* `Container` and `Default` regions now preserve the original safe area
(navigation bar padding)
* `SoftInput` and `All` regions continue to return keyboard height as
expected
* `None` remains unchanged and continues to return `0`

This ensures correct padding behavior without affecting existing
scenarios.

### Issues Fixed
Fixes #32871

Tested the behaviour in the following platforms
- [x] Android
- [ ] Windows
- [x] iOS
- [ ] Mac

**Note: Native padding validation in the test case is specific to
Android platform behavior.**

### Screenshots
| Before Issue Fix | After Issue Fix |
|------------------|-----------------|
| <video width="350" alt="withoutfix"
src="https://github.com/user-attachments/assets/ca528d7c-df1a-4559-b61c-c5716080a9d5"
/> | <video width="350" alt="withfix"
src="https://github.com/user-attachments/assets/53fab288-bc60-4d9d-abde-3e7022ac29e1"
/> |

---------
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
devanathan-vaithiyanathan pushed a commit to devanathan-vaithiyanathan/maui that referenced this pull request Jun 18, 2026
… is shown (dotnet#35084)

<!-- 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!

On Android, when the keyboard appears, `GetSafeAreaForEdge()`
recalculates bottom padding for all views. The logic returns the
keyboard height if the region includes the `SoftInput` flag; otherwise,
it unconditionally returns `0`.

Since `Container` and `Default` regions do not include the `SoftInput`
flag, the navigation bar padding (72–126px depending on device) gets
incorrectly removed. This causes bottom content to shift behind the
keyboard and snap back when dismissed.

This `return 0` behavior originated from the initial SafeAreaEdges
implementation (PR dotnet#31022) as a design assumption, not as part of a
specific fix. The equivalent iOS implementation does not exhibit this
behavior.

Removed the unconditional `return 0` fallback in `GetSafeAreaForEdge()`
for the bottom edge when the keyboard is visible.

With this change:

* `Container` and `Default` regions now preserve the original safe area
(navigation bar padding)
* `SoftInput` and `All` regions continue to return keyboard height as
expected
* `None` remains unchanged and continues to return `0`

This ensures correct padding behavior without affecting existing
scenarios.

Fixes dotnet#32871

Tested the behaviour in the following platforms
- [x] Android
- [ ] Windows
- [x] iOS
- [ ] Mac

**Note: Native padding validation in the test case is specific to
Android platform behavior.**

| Before Issue Fix | After Issue Fix |
|------------------|-----------------|
| <video width="350" alt="withoutfix"
src="https://github.com/user-attachments/assets/ca528d7c-df1a-4559-b61c-c5716080a9d5"
/> | <video width="350" alt="withfix"
src="https://github.com/user-attachments/assets/53fab288-bc60-4d9d-abde-3e7022ac29e1"
/> |

---------
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
@sheiksyedm sheiksyedm modified the milestones: .NET 10 SR8, .NET 10 SR9 Jun 18, 2026
PureWeen pushed a commit that referenced this pull request Jun 22, 2026
… is shown (#35084)

<!-- 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!

### Root Cause
On Android, when the keyboard appears, `GetSafeAreaForEdge()`
recalculates bottom padding for all views. The logic returns the
keyboard height if the region includes the `SoftInput` flag; otherwise,
it unconditionally returns `0`.

Since `Container` and `Default` regions do not include the `SoftInput`
flag, the navigation bar padding (72–126px depending on device) gets
incorrectly removed. This causes bottom content to shift behind the
keyboard and snap back when dismissed.

This `return 0` behavior originated from the initial SafeAreaEdges
implementation (PR #31022) as a design assumption, not as part of a
specific fix. The equivalent iOS implementation does not exhibit this
behavior.

### Description of Change
Removed the unconditional `return 0` fallback in `GetSafeAreaForEdge()`
for the bottom edge when the keyboard is visible.

With this change:

* `Container` and `Default` regions now preserve the original safe area
(navigation bar padding)
* `SoftInput` and `All` regions continue to return keyboard height as
expected
* `None` remains unchanged and continues to return `0`

This ensures correct padding behavior without affecting existing
scenarios.

### Issues Fixed
Fixes #32871

Tested the behaviour in the following platforms
- [x] Android
- [ ] Windows
- [x] iOS
- [ ] Mac

**Note: Native padding validation in the test case is specific to
Android platform behavior.**

### Screenshots
| Before Issue Fix | After Issue Fix |
|------------------|-----------------|
| <video width="350" alt="withoutfix"
src="https://github.com/user-attachments/assets/ca528d7c-df1a-4559-b61c-c5716080a9d5"
/> | <video width="350" alt="withfix"
src="https://github.com/user-attachments/assets/53fab288-bc60-4d9d-abde-3e7022ac29e1"
/> |

---------
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
kubaflo added a commit that referenced this pull request Jun 25, 2026
… is shown (#35084)

<!-- 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!

### Root Cause
On Android, when the keyboard appears, `GetSafeAreaForEdge()`
recalculates bottom padding for all views. The logic returns the
keyboard height if the region includes the `SoftInput` flag; otherwise,
it unconditionally returns `0`.

Since `Container` and `Default` regions do not include the `SoftInput`
flag, the navigation bar padding (72–126px depending on device) gets
incorrectly removed. This causes bottom content to shift behind the
keyboard and snap back when dismissed.

This `return 0` behavior originated from the initial SafeAreaEdges
implementation (PR #31022) as a design assumption, not as part of a
specific fix. The equivalent iOS implementation does not exhibit this
behavior.

### Description of Change
Removed the unconditional `return 0` fallback in `GetSafeAreaForEdge()`
for the bottom edge when the keyboard is visible.

With this change:

* `Container` and `Default` regions now preserve the original safe area
(navigation bar padding)
* `SoftInput` and `All` regions continue to return keyboard height as
expected
* `None` remains unchanged and continues to return `0`

This ensures correct padding behavior without affecting existing
scenarios.

### Issues Fixed
Fixes #32871

Tested the behaviour in the following platforms
- [x] Android
- [ ] Windows
- [x] iOS
- [ ] Mac

**Note: Native padding validation in the test case is specific to
Android platform behavior.**

### Screenshots
| Before Issue Fix | After Issue Fix |
|------------------|-----------------|
| <video width="350" alt="withoutfix"
src="https://github.com/user-attachments/assets/ca528d7c-df1a-4559-b61c-c5716080a9d5"
/> | <video width="350" alt="withfix"
src="https://github.com/user-attachments/assets/53fab288-bc60-4d9d-abde-3e7022ac29e1"
/> |

---------
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
kubaflo added a commit that referenced this pull request Jul 3, 2026
… is shown (#35084)

<!-- 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!

### Root Cause
On Android, when the keyboard appears, `GetSafeAreaForEdge()`
recalculates bottom padding for all views. The logic returns the
keyboard height if the region includes the `SoftInput` flag; otherwise,
it unconditionally returns `0`.

Since `Container` and `Default` regions do not include the `SoftInput`
flag, the navigation bar padding (72–126px depending on device) gets
incorrectly removed. This causes bottom content to shift behind the
keyboard and snap back when dismissed.

This `return 0` behavior originated from the initial SafeAreaEdges
implementation (PR #31022) as a design assumption, not as part of a
specific fix. The equivalent iOS implementation does not exhibit this
behavior.

### Description of Change
Removed the unconditional `return 0` fallback in `GetSafeAreaForEdge()`
for the bottom edge when the keyboard is visible.

With this change:

* `Container` and `Default` regions now preserve the original safe area
(navigation bar padding)
* `SoftInput` and `All` regions continue to return keyboard height as
expected
* `None` remains unchanged and continues to return `0`

This ensures correct padding behavior without affecting existing
scenarios.

### Issues Fixed
Fixes #32871

Tested the behaviour in the following platforms
- [x] Android
- [ ] Windows
- [x] iOS
- [ ] Mac

**Note: Native padding validation in the test case is specific to
Android platform behavior.**

### Screenshots
| Before Issue Fix | After Issue Fix |
|------------------|-----------------|
| <video width="350" alt="withoutfix"
src="https://github.com/user-attachments/assets/ca528d7c-df1a-4559-b61c-c5716080a9d5"
/> | <video width="350" alt="withfix"
src="https://github.com/user-attachments/assets/53fab288-bc60-4d9d-abde-3e7022ac29e1"
/> |

---------
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
@PureWeen PureWeen mentioned this pull request Jul 6, 2026
PureWeen added a commit that referenced this pull request Jul 6, 2026
## What's Coming

.NET MAUI inflight/candidate introduces significant improvements across
all platforms with focus on quality, performance, and developer
experience. This release includes 153 commits with various improvements,
bug fixes, and enhancements.


## Activityindicator
- [Android] Fix CollectionView ActivityIndicator not animating after
header height change by @Vignesh-SF3580 in
#35358
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView items fail to update ActivityIndicator state after
header height change](#33780)
  </details>

## Animation
- [Android] Fix Shadow property affecting transform matrix. by
@Shalini-Ashokan in #32962
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Applying Shadow property affects the properties in Visual
Transform Matrix](#32731)
  </details>

## API
- Add delegate-based alert dialog extensibility convention (no public
API changes) by @Redth in #35095
  <details>
  <summary>🔧 Fixes</summary>

- [Alert/Dialog system (`DisplayAlert`, `DisplayActionSheet`,
`DisplayPromptAsync`) needs a public extensibility
point](#34104)
  </details>

## Blazor
- [Android] Fix for BlazorWebView predictive back callback blocks
Android back-to-home animation by @BagavathiPerumal in
#35538
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] BlazorWebView predictive back callback blocks Android
back-to-home animation](#35397)
  </details>

- [Android] Fix BlazorWebView back callback can swallow the first Back
press when its callback is stale-enabled by @devanathan-vaithiyanathan
in #35611
  <details>
  <summary>🔧 Fixes</summary>

- [[inflight regression] Android BlazorWebView back callback can swallow
the first Back press when its callback is
stale-enabled](#35573)
  </details>

## Border
- [Windows] Fixed the ContentView clip is not updated when wrapping
inside the Border by @Ahamed-Ali in
#30408
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] ContentView clip is not updated when wrapping inside the
Border](#30404)
  </details>

- Fix Border.StrokeDashArray leaks dashed Borders when using a shared
Application resource by @devanathan-vaithiyanathan in
#35544
  <details>
  <summary>🔧 Fixes</summary>

- [`Border.StrokeDashArray` leaks dashed Borders when using a shared
Application resource](#35492)
  </details>

- [Windows] Border: Add AutomationPeer support by @Vignesh-SF3580 in
#35577
  <details>
  <summary>🔧 Fixes</summary>

- [Adding AutomationPeers to Windows
Borders](#27627)
  </details>

- [Windows] Fixed BoxView improper rendering inside Border by
@Dhivya-SF4094 in #28465
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Issues with BoxView Placement Inside
Border](#19668)
  </details>

## Button
- Prevent NullReferenceException in LayoutButton by @GamesAgeddon in
#35284
  <details>
  <summary>🔧 Fixes</summary>

- [NullReferenceException on iOS in Button.LayoutButton from
WrapperView.LayoutSubviews](#31048)
  </details>

- Fix TextColor null reset to restore platform defaults on iOS and
Android by @Shalini-Ashokan in #35563
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows, Android, iOS & Mac]Button TextColor does not restore to
platform default when reset to null after dynamic
update](#35513)
  </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>

- [MacCatalyst] Fix CollectionView Header/Footer Not Expanding to
Content Width by @KarthikRajaKalaimani in
#35213
  <details>
  <summary>🔧 Fixes</summary>

- [[MacOS][CV2] I8_View header and footer_Horizontal_View - Footer on
the right doesn't adapt when resizing the
window](#35113)
  </details>

- [iOS/MacCatalyst] Fix IndicatorView not updating when IndicatorSize is
changed to default value by @Shalini-Ashokan in
#35215
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS/MacCatalyst] IndicatorView does not update when IndicatorSize is
dynamically changed to the default
value](#35214)
  </details>

- CollectionView selecteditem background lost if collectionview (or
parent) IsEnabled changed. by @KarthikRajaKalaimani in
#31540
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView selecteditem background lost if collectionview (or
parent) IsEnabled changed.](#20615)
  </details>

- [iOS/macOS] CollectionView: Fix FlowDirection not working on EmptyView
by @Dhivya-SF4094 in #32674
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, MacOS] FlowDirection not working on EmptyView in
CollectionView](#32404)
- [[iOS, Mac] CollectionView EmptyViewTemplate content text is mirrored
when FlowDirection is
RightToLeft](#34522)
  </details>

- Fix iOS CollectionView stale layout invalidations by @filipnavara in
#35245
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] CollectionView tries to invalidate cells with invalid
indexes](#35244)
  </details>

- Fix Android grouped CollectionView header/footer rebind leak by
@AdamEssenmacher in #35368
  <details>
  <summary>🔧 Fixes</summary>

- [Memory leak when scrolling a CollectionView with
IsGrouped=true](#17698)
  </details>

- [Windows] Fix for Item should scrolled based on the
GroupHeaderTemplate by @SuthiYuvaraj in
#28074
  <details>
  <summary>🔧 Fixes</summary>

- [I9_Scroll by object for grouped data - The group name is always pined
at the top after clicking 'Scroll to Proboscis Monkey'
button](#27922)
  </details>

- [Android] Fix ScrollTo regression when IsGrouped true on
CollectionView by @SubhikshaSf4851 in
#35356
  <details>
  <summary>🔧 Fixes</summary>

- [[10.0.60] ScrollTo(0) not working anymore on CollectionView when
IsGrouped="True"](#35313)
  </details>

- [Android] Fix CollectionView scrolling performance regression by
@devanathan-vaithiyanathan in #35379
  <details>
  <summary>🔧 Fixes</summary>

- [[10.0.60] CollectionView scrolling performance
regression](#35344)
  </details>

- Optimize parent dynamic resource refresh by @AdamEssenmacher in
#35408
  <details>
  <summary>🔧 Fixes</summary>

- [Memory usage increases when scrolling collectionview if resources
count is more than 191](#22053)
  </details>

- Fix CI failure for CollectionView Scrolling Feature Tests due to PR
#35379 by @devanathan-vaithiyanathan in
#35536

- [iOS & Mac] CarouselViewController2 leaks on iOS/MacCatalyst due to
unremoved orientation notification observer by @SubhikshaSf4851 in
#35532
  <details>
  <summary>🔧 Fixes</summary>

- [CarouselViewController2 leaks on iOS/MacCatalyst due to unremoved
orientation notification
observer](#35472)
  </details>

- Fix CollectionView.SelectedItems leaks popped views when bound to a
retained ObservableCollection by @HarishwaranVijayakumar in
#35558
  <details>
  <summary>🔧 Fixes</summary>

- [`CollectionView.SelectedItems` leaks popped views when bound to a
retained
`ObservableCollection`](#35497)
  </details>

- Fix for Android - Dynamic Updates to CollectionView Header/Footer and
Templates Are Not Displayed by @SuthiYuvaraj in
#28904
  <details>
  <summary>🔧 Fixes</summary>

- [Android - Dynamic Updates to CollectionView Header/Footer and
Templates Are Not
Displayed](#28676)
  </details>

- [Windows] Fix CarouselView EmptyView display when filtering to zero
items by @Shalini-Ashokan in #29247
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] [Scenario Day] EmptyView using Template displayed at the
same time as the content](#7150)
  </details>

- [Android/iOS] Fix IsEnabled=False on CollectionView not working by
@devanathan-vaithiyanathan in #27749
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS/Android] CollectionView IsEnabled Not
Working](#27770)
  </details>

- Fix CarouselView.Loop property does not update dynamically and fails
to maintain the scroll position when the loop value is changed at
runtime by @devanathan-vaithiyanathan in
#29527
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] CarouselView.Loop = false causes crash on Android when
changed at runtime](#29411)
- [Loop Binding in CarouselView Not Updating Dynamically at
Runtime](#29449)
  </details>

- [iOS / Mac] Fix CollectionView.ScrollTo(index) silently failing
whenIsGrouped="True" by @Dhivya-SF4094 in
#35609
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView.ScrollTo(index) doesn't work correctly when
IsGrouped="True" on iOS, MacCatalyst, and
Windows](#35326)
  </details>

- Fix Android nested carousel scrolling by @AdamEssenmacher in
#35656
  <details>
  <summary>🔧 Fixes</summary>

- [Vertical scrolling not working for CarouselView and
CustomLayouts](#7814)
  </details>

- [Inflight regression] Fixed Test failures
ModalTabbedPagePushAsyncShouldOverlayBottomNavigationView and
GroupedCollectionViewScrollToIndexScrollsToCorrectItem by @Dhivya-SF4094
in #35823

- Fix CarouselView tests fail in June 8 Candidate by
@devanathan-vaithiyanathan in #35825

## Core
- Reduce allocations on AnimationManager by @pictos in
#35612
  <details>
  <summary>🔧 Fixes</summary>

- [AnimationManager is allocating a
lot](#35654)
  </details>

## Core Lifecycle
- Fix device test memory by @pictos in
#35487
  <details>
  <summary>🔧 Fixes</summary>

- [Memory leak Device.Test pass with false
positive](#35485)
  </details>

## Datepicker
- Fix MacCatalyst DatePicker focus handling by @AdamEssenmacher in
#35553
  <details>
  <summary>🔧 Fixes</summary>

- [[mauipalooza] DatePicker focus only works first
time](#5947)
  </details>

## DateTimePicker
- [Android] Fix DatePicker dialog dismisses after the device is rotated
by @HarishwaranVijayakumar in #34980
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] [Regression] DatePicker dialog dismisses after the device
is rotated](#34973)
  </details>

## Docs
- doc: Add paragraph to README.md explaining how to fetch the `maui`
project templates by @durandt in
#34561

## Drawing
- [Android] Fix LinearGradientBrush rendering as opaque black box by
@SubhikshaSf4851 in #35299
  <details>
  <summary>🔧 Fixes</summary>

- [[Regression] LinearGradientBrush broken on Android in
10.0.60](#35280)
- [10.0.60 breaks transparency on Brushes (on
Android?)](#35354)
  </details>

- Fix polygon points collection handler leak by @AdamEssenmacher in
#35526
  <details>
  <summary>🔧 Fixes</summary>

- [PolygonHandler and PolylineHandler leak when Points is replaced
before disconnect](#35387)
  </details>

## Editor
- [iOS] Fix Editor losing scrollability after rotation when
CharacterSpacing is applied by @Vignesh-SF3580 in
#35309
  <details>
  <summary>🔧 Fixes</summary>

- [[.NET 10][iOS] D2 - Editor can't be scrolled after rotating
simulator.](#35114)
  </details>

- [Inflight/Candidate][iOS & Mac] Fix for Editor height inconsistency
when VerticalTextAlignment is Center or End on iOS and MacCatalyst by
@BagavathiPerumal in #35662
  <details>
  <summary>🔧 Fixes</summary>

- [[MAUI] D13_Customize_Text_Alignment - Text Editor Height is not
consistent](#35615)
  </details>

## Entry
- [iOS/Mac] Fix Entry clear button retaining tint color after TextColor
is reset to null by @SyedAbdulAzeemSF4852 in
#35177
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS/Mac]Entry ClearButtonVisibility color does not reset when
TextColor is set to null](#35076)
  </details>

- [iOS/MacCatalyst] Fix Entry clear button appearing dimmed compared to
TextColor by @SyedAbdulAzeemSF4852 in
#35541
  <details>
  <summary>🔧 Fixes</summary>

- [[MacCatalyst] [Entry] ClearButtonVisibility color appears dimmed
compared to TextColor](#35517)
  </details>

- Fix pill-shaped focus ring on macOS 26 by @Dhivya-SF4094 in
#35393
  <details>
  <summary>🔧 Fixes</summary>

- [.Net 10 Picker item not centered and wrong focus outline of Entry on
Mac](#34899)
  </details>

- Fix Entry select all text on refocus not working on WinUI by @kubaflo
in #35383

## Essentials
- [Android] Fix Capture video crashes after stopping recording on
Android 12 by @HarishwaranVijayakumar in
#35638
  <details>
  <summary>🔧 Fixes</summary>

- [Capture video crashes after stopping recording on Android
12](#28891)
  </details>

- [Essentials] Browser.OpenAsync(External): drop visibility-filtered
ResolveActivity pre-check by @Kebechet in
#35652
  <details>
  <summary>🔧 Fixes</summary>

- [Browser.OpenAsync(External) on Android throws
FeatureNotSupportedException for verified App Link owner URLs even with
documented <queries> fix
applied](#35651)
  </details>

## Essentials Texttospeech
- [Mac, iOS, Windows] Fix for inconsistent Text-to-Speech rate behavior
by @HarishwaranVijayakumar in #32850
  <details>
  <summary>🔧 Fixes</summary>

  - [[Essentials] TTS rate](#32492)
  </details>

## Flyoutpage
- [iOS/Mac] Fix FlyoutPage RTL FlowDirection is not working by
@devanathan-vaithiyanathan in #34831
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS/Mac] FlyoutPage RTL FlowDirection is not working
properly](#34830)
  </details>

- [Android] Fix for Android 16 Back button is not working after command
from FlyoutPage by @BagavathiPerumal in
#35196
  <details>
  <summary>🔧 Fixes</summary>

- [Android: BackButton on Android 16 not working after command from
FlyOutPage](#33508)
  </details>

## Gestures
- Fix DragGestureRecognizer.DropCompleted event not firing in Android
platform by @KarthikRajaKalaimani in
#35179
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] DragGestureRecognizer.DropCompleted event not
firing](#17554)
  </details>

- Windows: Ensure layouts without background participate in hit testing
by @jpd21122012 in #34364
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] TapGestureRecognizer does NOT work on a ContentView without
Background](#32279)
  </details>

- [iOS] Fix VoiceOver dropping child labels on layouts with
SemanticProperties.Hint or TapGestureRecognizer by @Vignesh-SF3580 in
#35590
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] VoiceOver does not correctly describe View with
GestureRecognizers](#34380)
  </details>

## Hybridwebview
- Fix RemovePossibleQueryString to also strip URL fragments by @kubaflo
in #35551
  <details>
  <summary>🔧 Fixes</summary>

- [HybridWebViewQueryStringHelper.RemovePossibleQueryString removes '?'
but not other special characters e.g.
'#'](#31472)
  </details>

- [Revert] - [Windows] Fix WebView blank rendering when used with
HybridWebView by @SubhikshaSf4851 in
#35814

## Image
- Avoid image source layout invalidation for fixed-size views by
@AdamEssenmacher in #35369
  <details>
  <summary>🔧 Fixes</summary>

- [Image source swaps thrash layout under fixed constraints, tanking
frame rate when scrolling virtualized
collections](#32457)
  </details>

- [Windows] Fix Image layout inconsistency caused by async decode race
in GetDesiredSize by @praveenkumarkarunanithi in
#34699
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Image cropping produces inconsistent results when window is
minimized or resized](#32393)
  </details>

- [Testing] Include more testing around Windows Image Aspect recent
fixes by @kubaflo in #35620
  <details>
  <summary>🔧 Fixes</summary>

- [[Testing] Include more testing around Windows Image Aspect recent
fixes](#31686)
  </details>

- Revert PR #30068 — Fix FontImageSource centering regression on Windows
by @Shalini-Ashokan in #35642
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Image with FontImageSource is not centered and gets clipped
when WidthRequest/HeightRequest equals FontImageSource
Size](#35618)
  </details>

- [Android] Fix screenshot from WebView content not working by @kubaflo
in #35384
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Loading the captured screenshot from webview content to
Image control does not
visible](#30010)
  </details>

## Label
- Improve label mapping performance and ensure complete coverage
including ToPlatform and subsequent property changes by
@Tamilarasan-Paranthaman in #31159

- Fix for Label.FormattedText leaks labels when shared FormattedString
is stored in Application.Resources by @BagavathiPerumal in
#35582
  <details>
  <summary>🔧 Fixes</summary>

- [`Label.FormattedText` leaks labels when shared `FormattedString` is
stored in
`Application.Resources`](#35495)
  </details>

- [iOS] Fix Label Span formatting test failures on candidate branch by
@Vignesh-SF3580 in #35815

## Layout
- [iOS, Mac] Fix Item spacing not properly applied between items in
Horizontal LinearItemsLayout by @Dhivya-SF4094 in
#35445
  <details>
  <summary>🔧 Fixes</summary>

- [[CollectionView2] Item spacing not properly applied between items in
Horizontal
LinearItemsLayout](#35429)
  </details>

- [Windows] Add Automation Id support for Layouts. by @SubhikshaSf4851
in #35562
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] AutomationId does not work for ContentView, Layouts and
controls that inherit them](#4715)
  </details>

- Avoid layout diagnostics allocations without listeners by
@AdamEssenmacher in #35475
  <details>
  <summary>🔧 Fixes</summary>

- [MAUI 10 layout diagnostics no-consumer path is not
zero-allocation](#35473)
  </details>

- [Windows/Android] FlexLayout: Fix wrap misalignment due to
floating-point precision by @SuthiYuvaraj in
#31341
  <details>
  <summary>🔧 Fixes</summary>

- [FlexLayout Wrap Misalignment with Dynamically-Sized Buttons in .NET
MAUI](#30957)
  </details>

## Listview
- Fix Binding for ListView.IsRefreshing by @bill2004158 in
#28516
  <details>
  <summary>🔧 Fixes</summary>

- [Bind ListView.IsRefreshing is not
work.](#28514)
  </details>

## Map
- Fix iOS/Catalyst MapPool retention with MapElements by
@AdamEssenmacher in #35480
  <details>
  <summary>🔧 Fixes</summary>

- [iOS/Mac Catalyst MapHandler leaks MAUI Map views and MapElements
through MapPool](#35479)
  </details>

- Fix Android map view lifecycle cleanup by @AdamEssenmacher in
#35476
  <details>
  <summary>🔧 Fixes</summary>

- [Navigating to a page with Maps multiple times Increase RAM Usage but
doesn't reduce it back after navigating
back](#15257)
  </details>

- Fix Android map element options retention by @AdamEssenmacher in
#35634
  <details>
  <summary>🔧 Fixes</summary>

- [[Regression] [Android] [Maps] Map locks up after rendering 50
Polylines](#20502)
  </details>

## Menubar
- [MacCatalyst] Fix KeyboardAccelerator with Cmd+Shift modifiers breaks
entire MenuBarItem on Mac Catalyst by @KarthikRajaKalaimani in
#35318
  <details>
  <summary>🔧 Fixes</summary>

- [[Bug] KeyboardAccelerator with Cmd+Shift modifiers breaks entire
MenuBarItem on Mac
Catalyst](#35279)
  </details>

## Navigation
- [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and
Shell by @Dhivya-SF4094 in #35072
  <details>
  <summary>🔧 Fixes</summary>

- [On Screen Back Button Does Not Fire OnBackButtonPressed in
Android](#9095)
- [ContentPage's OnBackButtonPressed not invoked on iOS and
MacCatalyst](#8296)
  </details>

- Fix Android stale ContainerView root leak by @AdamEssenmacher in
#35372
  <details>
  <summary>🔧 Fixes</summary>

- [Android: Stale ContainerView retains replaced FlyoutPage
graph](#35371)
  </details>

- [Android] Fix for predictive back-to-home animation blocked by
unconditional back callback registration by @BagavathiPerumal in
#35223
  <details>
  <summary>🔧 Fixes</summary>

- [OnBackInvokedCallbacks block back-to-home
animation](#34594)
- [Migrate to
OnBackPressedCallback](#24752)
  </details>

- Revert [Android, iOS] - Flyout icon should remain visible when a page
is pushed onto a NavigationPage or Shell page with the back button
disabled. by @praveenkumarkarunanithi in
#35604

## Picker
- [iOS] Fix Picker CharacterSpacing lost after item selection when Title
is set by @SyedAbdulAzeemSF4852 in
#34974
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Picker loses CharacterSpacing after item selection when Title
is set](#34971)
  </details>

- [iOS] Fix Picker CharacterSpacing ignored on initial load by
@SyedAbdulAzeemSF4852 in #34957
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Picker ignores CharacterSpacing on initial
load](#34955)
  </details>

- [Windows] Fix for Picker CharacterSpacing Not Being Applied to Title
and Dropdown Items by @SyedAbdulAzeemSF4852 in
#30612
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Picker CharacterSpacing property not applied to Title and
PickerItems text](#30464)
  </details>

- Fix Picker SelectedIndex deferred initialization by @AdamEssenmacher
in #35629
  <details>
  <summary>🔧 Fixes</summary>

- [Picker Attribute "SelectedIndex" Not being respected on page load on
Android?](#9150)
  </details>

## Progressbar
- Fix iOS ProgressBar bounding box by @AdamEssenmacher in
#35507
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] ProgressBar and Label don't correctly obey height and width at
the core level](#7935)
  </details>

## RadioButton
- [Windows, Android] Fix Border Color and Border Width Not applying for
Radio Button by @HarishwaranVijayakumar in
#35616
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows, Android] Border Color and Border Width Not applying for
Radio Button.](#35587)
  </details>

- [inflight/current] Fixes a CS0111 build failure in RadioButton.cs
caused by a duplicate OnPropertyChanged override by
@HarishwaranVijayakumar in #35631

- Revert - Fix TalkBack not correctly narrating RadioButtons with
Content by @devanathan-vaithiyanathan in
#35625
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] MissingMethodException
AccessibilityNodeInfoCompat.set_Checked(bool) on 10.0.70 due to
AndroidX.Core 1.17 breaking
change](#35584)
  </details>

## Refreshview
- [Windows] Fix RefreshView IsRefreshing property not working while
binding by @devanathan-vaithiyanathan in
#34845
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] RefreshView IsRefreshing property not working while
binding](#30535)
  </details>

- [Android] Fix for RefreshView triggering pull-to-refresh when
scrolling inside a WebView with internal scrollable content by
@BagavathiPerumal in #34614
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] RefreshView triggers pull-to-refresh immediately when
scrolling up inside a
WebView](#33510)
  </details>

## SafeArea
- [Android] Fix bottom safe area padding dropping to zero when keyboard
is shown by @praveenkumarkarunanithi in
#35084
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Bottom insets issues when keyboard is
shown.](#32871)
  </details>

- Gate SafeArea inset listeners in recycler items by @AdamEssenmacher in
#35664
  <details>
  <summary>🔧 Fixes</summary>

- [[10.0.60] CollectionView scrolling performance
regression](#35344)
  </details>

## ScrollView
- [Windows] Fix COMException when restoring a ScrollView as
ContentPage.Content after swapping it out by @Vignesh-SF3580 in
#35360
  <details>
  <summary>🔧 Fixes</summary>

- [COMException when clone a page's content to a object and set it back
later in mainthread on
Windows](#35277)
  </details>

- Fix - ScrollView.ScrollToAsync(x, y, animated) doesn't work when
called from Page.OnAppearing by @Shalini-Ashokan in
#35395
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] ScrollView.ScrollToAsync(x, y, animated) doesn't work when
called from
Page.OnAppearing](#31177)
  </details>

## Searchbar
- [Android] Fix SearchBar IME full-screen extract mode in landscape
orientation by @SubhikshaSf4851 in
#35197
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Investigate SearchBar presentation in horizontal screen
orientation ](#14708)
  </details>

- [iOS 26] Fix SearchBar layout spacing issues for small HeightRequest
values by @devanathan-vaithiyanathan in
#35347
  <details>
  <summary>🔧 Fixes</summary>

- [Spacing problem with maui 10.0.60
iOS](#35286)
  </details>

## SearchBar
- [Windows] Fix SearchHandler does not focus when ShowSoftInputAsync is
called by @praveenkumarkarunanithi in
#35079
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] SearchHandler.ShowSoftInputAsync() does not focus the
SearchHandler](#34930)
  </details>

## Shell
- Fix Android layout jump when navigating with IME open and
NavBarIsVisible=false by @jpd21122012 in
#34621
  <details>
  <summary>🔧 Fixes</summary>

- [Shell page without NavBar jumping when navigating with keyboard
open](#34584)
  </details>

- [Android] Add defensive not null check to
SearchHandlerAppearanceTracker.FocusChange by @Transis-Felipe in
#29939

- [Android] Fix for Shell colors change before navigation completes on
Android in .NET 10 by @BagavathiPerumal in
#35295
  <details>
  <summary>🔧 Fixes</summary>

- [Shell colors change before navigation completes on Android in .NET
10](#35060)
  </details>

- [Windows] Fix Shell FlyoutItem not taking full width by
@SubhikshaSf4851 in #35131
  <details>
  <summary>🔧 Fixes</summary>

- [MAUI WinUI Grids don't render properly in flyout
menu](#19542)
- [[Windows] [.NET 8 RC2] FlyoutItem Backgroundcolor Is not fully
displaying](#18238)
  </details>

- [Android, iOS, Catalyst] Fix SearchHandler.BackgroundColor cannot be
reset to null by @HarishwaranVijayakumar in
#35224
  <details>
  <summary>🔧 Fixes</summary>

- [[Android, iOS, Catalyst] SearchHandler.BackgroundColor cannot be
reset to null](#35088)
  </details>

- Fix for ApplyQueryAttributes being called on non-destination pages
during back navigation by @BagavathiPerumal in
#35392
  <details>
  <summary>🔧 Fixes</summary>

- [ApplyQueryAttributes gets called for not activated (navigated to)
page on back](#35183)
  </details>

- [Android] Fix Shell flyout background to follow Material 3 theme
colors by @SyedAbdulAzeemSF4852 in
#35148
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Shell Flyout ignores Material 3 surface color when
UseMaterial3 is enabled](#35147)
  </details>

- [Android] Fix Shell.FlyoutHeader background incorrect by
@SyedAbdulAzeemSF4852 in #35489
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Shell.FlyoutHeader background is
incorrect](#35416)
  </details>

- [iOS/MacCatalyst] Fix Shell.BackgroundColor not applied to bottom
TabBar by @Shalini-Ashokan in #35545
  <details>
  <summary>🔧 Fixes</summary>

- [[MacCatalyst] Shell.BackgroundColor not applied to bottom
TabBar](#35380)
- [[Catalyst] Shell.TabBarBackgroundColor is not
applied](#35381)
  </details>

- [Android] Fix Shell FlyoutIcon tint loss after navigation by
@SyedAbdulAzeemSF4852 in #35561
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] The flyout icon loses
colours](#35390)
  </details>

- [iOS] Fix Shell - opened keyboard on modal page shifts parent
page/frame behind modal after update to 10.0.60 by @KarthikRajaKalaimani
in #35559
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Shell - opened keyboard on modal page shifts parent page/frame
behind modal after update to
10.0.60](#35401)
  </details>

- Fix intermediate pages not receiving query parameters in multi-page
Shell navigation by @mattleibow in
#35432
  <details>
  <summary>🔧 Fixes</summary>

- [Shell GoToAsync: no way to pass query parameters to intermediate
pages in multi-segment
navigation](#35107)
  </details>

- [Windows] Fix Shell title bar overlap with window controls in RTL mode
by @Shalini-Ashokan in #33109
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Binding RTL FlowDirection in Shell causes Flyout MenuIcon
and native window controls to
overlap](#32476)
  </details>

- [macOS] Fix IsEnabled property false not working on MenuBarItem by
@devanathan-vaithiyanathan in #35546
  <details>
  <summary>🔧 Fixes</summary>

- [[macOS] IsEnabled property false not working on
MenuBarItem](#34038)
  </details>

- Fix Android Shell top inset when nav bar is hidden by @ne0rrmatrix in
#35555
  <details>
  <summary>🔧 Fixes</summary>

- [wrong statusbar height when Android device has a
notch](#35103)
  </details>

- Fix Changing Content property of ShellContent doesn't change visual
content by @devanathan-vaithiyanathan in
#34630
  <details>
  <summary>🔧 Fixes</summary>

- [Changing Content property of ShellContent doesn't change visual
content. ](#12669)
  </details>

- Fixed a NullReferenceException when starting application with empty
shell on Windows by @Shalini-Ashokan in
#28879
  <details>
  <summary>🔧 Fixes</summary>

- [NullReferenceException when starting application with empty shell on
Windows](#21562)
- [Using SelectionChangedCommand with CollectionView in
Shell.FlyoutContent results in Win32 Unhandled
Exception](#10041)
  </details>

## Slider
- [iOS] Slider: Scale ThumbImageSource to match default thumb size by
@NirmalKumarYuvaraj in #34184
  <details>
  <summary>🔧 Fixes</summary>

- [[Slider] MAUI Slider thumb image is big on
android](#13258)
  </details>

## Stepper
- Fix iOS 26 Stepper overlap in landscape by @AdamEssenmacher in
#35374
  <details>
  <summary>🔧 Fixes</summary>

- [[.NET10] D10-The number and buttons overlap after rotating the
simulator.](#35211)
  </details>

## SwipeView
- Fix SwipeViews with invoked properties crash the app in Release mode
by @BagavathiPerumal in #35208
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS/Catalyst] Swipeviews with invoked properties crash the app in
Release](#18055)
  </details>

- Fix SwipeItemView command leak by @AdamEssenmacher in
#35510
  <details>
  <summary>🔧 Fixes</summary>

- [`SwipeItemView.Command` leaks row views and command parameters
through
`CanExecuteChanged`](#35498)
  </details>

- [iOS/Android] Fix SwipeItem.IsVisible not refreshing native swipe
items when binding changes by @SyedAbdulAzeemSF4852 in
#35217
  <details>
  <summary>🔧 Fixes</summary>

- [SwipeItem.IsVisible doesn't properly refresh the native swipe items
when the binding value changes
dynamically](#34832)
  </details>

- Fix SwipeView memory leak when SwipeItems are reused or replaced by
@Vignesh-SF3580 in #35539
  <details>
  <summary>🔧 Fixes</summary>

- [SwipeView leaks when SwipeItems are reused or
replaced](#35481)
  </details>

- Fix SwipeItem IconImageSource color handling and rendering across
platforms by @Shalini-Ashokan in
#35632
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] SwipeItem IconImageSource should allow more
configuration](#23074)
  </details>

## Switch
- [Android/Windows] Fix RadioButton gradient not clearing when switching
background by @Shalini-Ashokan in
#34997
  <details>
  <summary>🔧 Fixes</summary>

- [RadioButton Background does not reset when set to null at
runtime](#34993)
  </details>

- [Windows] Fix "PlatformView cannot be null here" exception during
handler disconnect by @kubaflo in
#35314
  <details>
  <summary>🔧 Fixes</summary>

- ["PlatformView cannot be null here" Exception in Switch control
[Windows]](#27101)
  </details>

- [iOS 26] Fix Switch ThumbColor and OffColor not applied on initial
load by @SyedAbdulAzeemSF4852 in
#35400
  <details>
  <summary>🔧 Fixes</summary>

- [iOS 26 Switch default color for Off and On is incorrect + Off Color
is not applied at start + Thumb Colors is not
applied](#35257)
  </details>

- [Android] Fix AppBar flicker on CheckBox/Switch toggle with Material 3
by @Dhivya-SF4094 in #35181
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] AppBar flicker while changing the CheckBox or Switch state
after scrolling in Material
3](#35180)
  </details>

- [Android] Fix Switch Shadow Does Not Follow Thumb when Toggle On or
Off by @Dhivya-SF4094 in #35623
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Switch Shadow Does Not Follow Thumb when Toggle On or
Off](#30046)
  </details>

## TabbedPage
- [Android] Fix TabbedPage truncating tab titles instead of scrolling by
@Shalini-Ashokan in #35086
  <details>
  <summary>🔧 Fixes</summary>

- [Maui migrating Xamarin to Maui - Tabbed Page Scroll Issue - Tabs are
not scrolling](#16470)
  </details>

- [Android] Fix BottomNavigationView remaining visible for TabbedPage
inside modal NavigationPage after PushAsync by @Dhivya-SF4094 in
#35359
  <details>
  <summary>🔧 Fixes</summary>

- [Android TabbedPage inside Modal Navigation does not overlay
BottomNavigationView after PushAsync in .NET MAUI
10.0.60](#35331)
  </details>

- [Android & iOS] TabbedPage leaks with shared GradientBrush. by
@SubhikshaSf4851 in #35543
  <details>
  <summary>🔧 Fixes</summary>

- [TabbedPage leaks renderer/manager when BarBackground uses shared
GradientBrush resource](#35469)
  </details>

## Templates
- Bumps Syncfusion.Maui.Toolkit dependency to version 1.0.10 by
@PaulAndersonS in #35608

## Toolbar
- Fix Android app bar inset background coloring by @ne0rrmatrix in
#35601
  <details>
  <summary>🔧 Fixes</summary>

- [Android Edge-to-Edge: Shell and NavigationPage Top Bar colour is not
used for status bar.](#35568)
  </details>

## Tooling
- Add default .gitignore to MAUI project templates by @davidortinau in
#34862
  <details>
  <summary>🔧 Fixes</summary>

- [Add a gitignore file to the Maui template in VS
2022](#4131)
  </details>

- Fix: Propagate AdditionalProperties from ProjectReference in
ResizetizeCollectItems by @mattleibow in
#35575
  <details>
  <summary>🔧 Fixes</summary>

- [Resizetizer GetMauiItems does not propagate ProjectReference
AdditionalProperties](#35574)
  </details>

## WebView
- [Windows] Fix WebView blank rendering when used with HybridWebView by
@SubhikshaSf4851 in #35092
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] WebView Regression from NET9 to
NET10](#34558)
  </details>

- Fix AOT integration test failures: suppress IL3050/IL2026 for
HybridWebViewHandler in AddControlsHandlers by @mattleibow via @Copilot
in #34868

- Fix Android activity result callback leak by @AdamEssenmacher in
#35436
  <details>
  <summary>🔧 Fixes</summary>

- [Android WebView file chooser callbacks leak via
ActivityResultCallbackRegistry](#35405)
  </details>

- [Windows] Fix WebView Does Not Inherit App Theme by
@devanathan-vaithiyanathan in #35037
  <details>
  <summary>🔧 Fixes</summary>

- [WebView on Windows Does Not Inherit App
Theme](#34823)
  </details>

- Fix for WebView leaks when reusing a shared WebViewSource by
@BagavathiPerumal in #35524
  <details>
  <summary>🔧 Fixes</summary>

- [WebView leaks when reusing a shared
WebViewSource](#35483)
  </details>

- Destroy Android WebView on handler disconnect by @AdamEssenmacher in
#35552
  <details>
  <summary>🔧 Fixes</summary>

- [Right way to dispose page with
WebView](#18021)
  </details>

## Xaml
- Fix: Enable VisualStateManager to set Style property dynamically by
@Shalini-Ashokan in #33389
  <details>
  <summary>🔧 Fixes</summary>

- [Setting the `Style` property using the `VisualStateManager` within a
Style resource does not
work](#17175)
  </details>

- Fix Implicit parameter conversion from integer to byte fails with
source generated XAML by @KarthikRajaKalaimani in
#35444
  <details>
  <summary>🔧 Fixes</summary>

- [Implicit parameter conversion from integer to byte fails with source
generated XAML](#35396)
  </details>


<details>
<summary>🔧 Infrastructure (3)</summary>

- Fix: Build fails when appicon is an empty (but valid) SVG by
@Shalini-Ashokan in #35305
  <details>
  <summary>🔧 Fixes</summary>

- [Build fails when appicon is an empty (but valid) svg after upgrade to
10.0.60](#35293)
  </details>
- [inflight/current] Fix CS0111 duplicate GetNativeCharacterSpacing in
PickerHandlerTests.iOS by @SyedAbdulAzeemSF4852 in
#35419
- Update WinAppSDK to 1.8.260508005 by @kubaflo in
#35678

</details>

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

- Backport Test Fixes and Snapshots from SR to Inflight Branch by
@Tamilarasan-Paranthaman in #35499
- Fix hardcoded version of Microsoft.DotNet.XHarness.TestRunners.Xunit
in test projects by @akoeplinger in
#29905
- [Testing] Fixed Build error on inflight/ candidate PR 35716 by
@HarishKumarSF4517 in #35730

</details>

<details>
<summary>🏠 Housekeeping (1)</summary>

- [HouseKeeping] Fix inconsistant namespace in HostApp by
@NirmalKumarYuvaraj in #35210

</details>

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

- Add .cab and ReconnectModal.razor.js to signing config by @jesuszarate
in #35026
- Fix typo in Clipboard.shared.cs by @Deadpikle in
#35316
- Fix single modifier for NSMenuItem accelerators by @jeremy-visionaid
in #35351
- Avoid unnecessary LINQ enumerations by @jeremy-visionaid in
#35272
- [Testing] Replace retryDelay with retryTimeout in UI tests by @kubaflo
in #35367
- Replace JavaFinalize() with Dispose(bool) in GenericAnimatorListener
by @jonathanpeppers in #35548
- Fix incorrect SDK provisioning commands in integration-tests
instructions by @davidnguyen-tech in
#34992
- Fix VisualElement.ChangeVisualState() gets stuck in Selected state by
@Dhivya-SF4094 in #35421
  <details>
  <summary>🔧 Fixes</summary>

- [VisualElement's ChangeVisualState gets stuck in Selected
state](#35399)
  </details>

</details>

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

Fixes #4131, Fixes #4715, Fixes #5947, Fixes #7150, Fixes #7814, Fixes
#7935, Fixes #8296, Fixes #9095, Fixes #9150, Fixes #10041, Fixes
#12669, Fixes #13258, Fixes #14708, Fixes #15257, Fixes #16470, Fixes
#17175, Fixes #17554, Fixes #17698, Fixes #18021, Fixes #18055, Fixes
#18238, Fixes #19542, Fixes #19668, Fixes #20502, Fixes #20615, Fixes
#21562, Fixes #22053, Fixes #23074, Fixes #24752, Fixes #27101, Fixes
#27627, Fixes #27770, Fixes #27922, Fixes #28514, Fixes #28676, Fixes
#28891, Fixes #29411, Fixes #29449, Fixes #30010, Fixes #30046, Fixes
#30404, Fixes #30464, Fixes #30535, Fixes #30957, Fixes #31048, Fixes
#31177, Fixes #31472, Fixes #31686, Fixes #32279, Fixes #32393, Fixes
#32404, Fixes #32457, Fixes #32476, Fixes #32492, Fixes #32731, Fixes
#32871, Fixes #33508, Fixes #33510, Fixes #33780, Fixes #34038, Fixes
#34104, Fixes #34257, Fixes #34380, Fixes #34522, Fixes #34558, Fixes
#34584, Fixes #34594, Fixes #34823, Fixes #34830, Fixes #34832, Fixes
#34899, Fixes #34930, Fixes #34955, Fixes #34971, Fixes #34973, Fixes
#34993, Fixes #35060, Fixes #35076, Fixes #35088, Fixes #35103, Fixes
#35107, Fixes #35113, Fixes #35114, Fixes #35147, Fixes #35180, Fixes
#35183, Fixes #35211, Fixes #35214, Fixes #35244, Fixes #35257, Fixes
#35277, Fixes #35279, Fixes #35280, Fixes #35286, Fixes #35293, Fixes
#35313, Fixes #35326, Fixes #35331, Fixes #35344, Fixes #35354, Fixes
#35371, Fixes #35380, Fixes #35381, Fixes #35387, Fixes #35390, Fixes
#35396, Fixes #35397, Fixes #35399, Fixes #35401, Fixes #35405, Fixes
#35416, Fixes #35429, Fixes #35469, Fixes #35472, Fixes #35473, Fixes
#35479, Fixes #35481, Fixes #35483, Fixes #35485, Fixes #35492, Fixes
#35495, Fixes #35497, Fixes #35498, Fixes #35513, Fixes #35517, Fixes
#35568, Fixes #35573, Fixes #35574, Fixes #35584, Fixes #35587, Fixes
#35615, Fixes #35618, Fixes #35651, Fixes #35654

</details>


**Full Changelog**:
main...inflight/candidate
@kubaflo kubaflo mentioned this pull request Jul 6, 2026
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 19, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-safearea Issues/PRs that have to do with the SafeArea functionality partner/syncfusion Issues / PR's with Syncfusion collaboration platform/android s/agent-changes-requested AI agent recommends changes - found a better alternative or issues 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

Development

Successfully merging this pull request may close these issues.

[Android] Bottom insets issues when keyboard is shown.

9 participants