Repository navigation
[Android] Fix CollectionView EmptyView: EmptyViewContentView calls requestLayout() during every layout pass - #40363
Conversation
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 40363Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 40363" |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Expert Review — 1 finding
Reviewed commit 7cbd03c.
Source assessment incomplete (9/10 dimensions); finding count is partial.
See inline comments for details.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Tests Failure Analysis
🧪 CI Analysis — click to expand📊 maui-pr
🧪 maui-pr-devicetests
🧪 maui-pr-uitests
🧭 Follow-up — actions and refreshNext action: Reconcile the new EmptyView assertion with the fix; restore missing diagnostics and isolate unresolved failures.
|
|
/rebase |
|
Unable to rebase this branch automatically. It may have conflicts with its base branch, or the PR author has not allowed maintainer edits. Please rebase manually. |
There was a problem hiding this comment.
Expert Review — 0 findings
Reviewed commit c49b360.
Source assessment incomplete (9/10 dimensions); finding count is partial.
PR Test Gate
🧪 Gate analysis — click to expand✅ Passed. The selected verification satisfied the gate's passing conditions. Unmatched, skipped, or inconclusive groups are not passing evidence. 📱 Device tests
Execution log excerptsWithout fix With fix PR head: c49b3608. Without-fix baseline: 331056d8. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
… EmptyViewContentView calls requestLayout() during every layout pass Copy of dotnet#40363 for a /review run-tests trial. Do not merge.
There was a problem hiding this comment.
🟡 Changes recommended
An empty CollectionView can enter a continuous layout loop because deferred layout requests repeatedly react to an infinite-versus-finite height mismatch, even when its bounds are unchanged.
1 open issue
What changed in this PR
This PR addresses Android CollectionView EmptyView layout warnings reported in #40308 by changing how the handler requests remeasurement.
Changes:
- Uses
RequestLayoutIfNeededfor both existing and deferred EmptyView holders. - Adds an Android device test that resizes a sibling control and checks logcat for improper layout warnings.
| File | Description |
|---|---|
| src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Android.cs | Adds the regression scenario, frame waits, and logcat checks. |
| src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Android.cs | Defers EmptyView layout requests when Android is already laying out views. |
Review effort: Balanced
| // ViewHolder exists, request layout immediately to avoid frame delay | ||
| viewHolder.ItemView.RequestLayout(); | ||
| // Defer the request if Android is already laying out the view. | ||
| PlatformInterop.RequestLayoutIfNeeded(viewHolder.ItemView); |
32f5a8b
into
dotnet:candidate/11.0.1xx-sr2
…ViewContentView calls requestLayout() during every layout pass Copy of dotnet#40363 for a /review run-tests trial. Do not merge.
…#40305) <!-- 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! ### Target Branch - [x] I selected the applicable base branch using the [contribution guide](https://github.com/dotnet/maui/blob/main/.github/CONTRIBUTING.md#choose-your-pr-base-before-starting). CI and workflow infrastructure, so it targets `main`. The slash command activates only once the workflow is on the default branch. ### Description of Change Adds `/review run-tests`. Two AI models, **GPT-6.1 Sol** and **Claude Opus 5.5**, each read the PR diff independently and pick the UI test categories and platforms it can affect. `maui-pr-uitests` then runs **only the union of their picks**. A CollectionView-only Android fix runs the CollectionView shards on Android, not all 77 categories on 4 platforms. Replaces #40253. **When what runs** | Trigger | What runs | | --- | --- | | `/review run-tests` on any PR (write access) | Only what the models selected: the per-platform union of both picks | | Both models choose the full suite (e.g. core `Element` changes) | Full suite | | Neither model produces a pick | Nothing is queued; the comment says so | | `/azp run maui-pr-uitests` | Full suite, unchanged | | Branch, scheduled and manual builds (`main`, `release/*`, `candidate/*`, …) | Full suite, unchanged. `ci-uitests.yml` only passes a selection when `Build.SourceBranch` is `refs/pull/*`. | Nothing is ever added that a model did not choose: no full-suite fallback, unknown category names run nothing, Android and the Material3 lane run only when selected (also enforced in the pipeline template), and only the five declared proposal fields are read. **What the requester sees** 1. **Native checks in the PR's checks list.** `maui-pr-uitests` is queued through the Build API as a *pull-request* build (`reason=pullRequest` + `triggerInfo.pr.sourceSha`), so Azure Pipelines reports the run and every job as checks on the PR head, exactly like `/azp run`. 2. **Skipped checks for everything not selected.** One `maui-pr-uitests (skipped) <Category>` check per category and one `maui-pr-uitests (skipped) <Platform> UITests` check per platform, plus a `maui-pr-uitests (test selection)` summary check. 3. **A summary comment in the PR Test Gate layout:** title, requester line and Result / Platforms / Categories / Commit badges, with everything else in one collapsed **Test selection** section: build status, each model's summary, what ran, results with failed tests, the skipped list, and **Why these tests** with a per-platform table of each model's pick and both rationales. `review-run-tests-results.yml` updates it in place when the `maui-pr-uitests` check completes, with a half-hourly sweep as backup. **How it works** | Piece | Role | | --- | --- | | `copilot-review-run-tests.md` (gh-aw, GPT-6.1 Sol) | Pre-activation authorizes an exact `/review run-tests` from a write+ user and collects the diff, the category inventory from `eng/pipelines/common/ui-tests.yml`, which categories have enabled tests per platform, and which the PR's own tests enable. The read-only agent (`checkout: false`) proposes platforms, categories, `full_run`, a summary and a rationale. The safe-output job saves the proposal and starts the Opus workflow. | | `copilot-review-run-tests-opus.md` (gh-aw, Claude Opus 5.5, new) | `workflow_dispatch` only. Verifies the source run (run-tests lock workflow, default branch, same repo, under 3 hours old), reuses its context artifact, and makes an independent proposal with the same shared prompt (`shared/run-tests-selection.md`). Then it starts the dispatcher with both run ids. If either agent fails, the chain still hands over. | | `review-run-tests-dispatch.yml` | `workflow_dispatch` on `main`, with **no environment**, so its OIDC subject is `repo:dotnet/maui:ref:refs/heads/main` like `review-trigger.yml`. Verifies both runs, downloads each proposal (a listed artifact that fails to download fails the job), checks each proposal's model and source run, and runs `Invoke-RunTests.ps1`. | | `Invoke-RunTests.ps1` | Trusted. Validates each proposal against the inventory, prunes each platform to categories with enabled tests there, and merges the two per platform. When every selected platform runs the same categories they are sent as plain names; otherwise every entry is platform-qualified (`android:Button`, `ios:Label`), never a mix. Re-checks the requester's permission, the PR head and its target branch, waits for a verified test-merge commit, queues the pull-request build and cancels it if Azure didn't apply the selection. Then publishes the Skipped and selection checks and the comment. | | `review-run-tests-results.yml` | Updates the comment when the `azure-pipelines` `maui-pr-uitests` check completes; sweeps every 30 minutes as backup. | | `eng/pipelines/**/ui-tests*.yml`, `ci-uitests.yml` | Optional `selectedRun`, `selectedPlatforms`, `selectedCategories` parameters filter stages and matrix entries at compile time. `CollectionView` and `Shell` expand to their shards; `<platform>:<Category>` limits a category to one platform, and every stage guard, including the dedicated Shell renderer, SafeAreaEdges, Material3 and Windows CV1 lanes, handles both the plain and the qualified form. The sample build gets template-evaluated booleans, never parameter text. Defaults expand to exactly `main`'s jobs. | | `review-trigger.yml`, `ReviewCommandHelpers.ps1`, rebalance skill | `/review run-tests` is excluded from `/review` and from recovery. `rebalance-ui-test-categories` understands the typed `categoryGroupsToTest` parameter. | `/azp run`, `/review`, `/review gate` and `/review tests` are unchanged. Device tests are out of scope. **Model policy exception:** the repo's GPT-only automation policy (`CopilotPipeline.Tests.ps1`, from #38040) gets one narrow exception: exactly `claude-opus-5.5`, only in the run-tests selection files (the Opus workflow and its lock file, the dispatcher, `RunTests.Common.ps1` and the tests). Any other Claude/Anthropic model, or that model anywhere else, still fails the test. Opus only proposes a selection; trusted code validates it, and it can only add tests, never remove the other model's picks. **Security review notes:** the new Opus workflow uses only existing secrets (the `COPILOT_PAT_0..9` pool via `copilot-pat-pool`); the dispatcher uses the existing `AZDO_TRIGGER_TENANT_ID` / `AZDO_TRIGGER_CLIENT_ID`. No new third-party actions. All actions are pinned by SHA. ### Validation **End to end in a fork (kubaflo/maui)** through the real GPT agent → Opus agent → dispatcher path, on 8 current PRs. All 24 workflow runs succeeded; each PR got the comment with both models' picks and the Skipped checks. Azure is skipped there because the fork has no federated identity. **Real builds on dotnet/maui.** Other PRs' merge refs don't have the new pipeline parameters until this merges, so each trial was a temporary draft PR: this branch plus one current PR's change. `Invoke-RunTests.ps1` ran locally with both models' proposals from the fork run on the same diff, queued `maui-pr-uitests`, and posted the comment. Every build got exactly the selected platforms and categories. | Trial | Copy of | GPT-6.1 Sol | Claude Opus 5.5 | Ran | Result | | --- | --- | --- | --- | --- | --- | | #40442 | #40369 Windows title bar | `Window` | + `TitleView`, `Lifecycle` | Windows, 3 categories | Passed in 39 min | | #40443 | #40366 Shell modal stack | `Shell1/2` on iOS, Mac | same | iOS + MacCatalyst | Passed | | #40444 | #40363 Android EmptyView | CollectionView + CarouselView | same | Android, 8 categories | Passed in 41 min | | #40445 | #40344 Shell tab reselect | `Shell1/2`, `Navigation` | + `TabbedPage` | All platforms, 4 categories | Running at time of writing | | #40446 | #40291 `DisplayPromptAsync` | Prompt, Alert, ActionSheet | same | All platforms, 3 categories | 1 test failed on MacCatalyst | | #40447 | #40234 `Element` / VSM threading | Full suite | Full suite | Full suite | Running at time of writing | | #40448 | #40385 CodeQL CI-only | Nothing | Nothing | Nothing (no build) | Comment only | | #40449 | #39487 Button corner radius | `Button`, `ImageButton` on iOS, Mac | same | iOS + MacCatalyst | 1 Button test failed | The failures are the same tests that failed in an earlier round on the same copied changes, so they come from those PRs, not the selection. The comments were refreshed from the real timelines and test results with `Update-RunTestsResults.ps1`. **Azure previews of this PR's merge ref:** - Defaults: identical to `main` (13 jobs, 157 matrix entries). - Android `Button`: 2 jobs, no Material3 lane. `Button` + `Material3`: the Material3 lane is included. - Qualified selections: `android:Material3` + `ios:Label` runs only the Material3 lane on Android; `android:Shell1` also runs the Shell renderer lane; `android:SafeAreaEdges` runs its dedicated lane; `windows:CollectionView1` runs the CV1 lane; an Android-only CollectionView pick never starts the Windows CV1 lane. - `selectedPlatforms` containing `"x; Remove-Item"`: only template booleans reach the build step. **Tests:** `RunTests.Tests.ps1` has 39 Pester tests covering the inventory and `#if` evaluator, pruning and qualification, the two-model union (one model empty, neither, full only when chosen), AI-only rules, the queue request and dropped-selection guard, the check plan, comment rendering and updates, and static template checks. The `ReviewTrigger`, `Recover-MissedReviewCommands` and `CopilotPipeline` suites pass. `gh aw compile --strict` succeeds. **Not verified before merge:** - The slash command and the dispatcher's OIDC exchange on `dotnet/maui` itself. GitHub only runs them from the default branch. After merge, comment `/review run-tests` on a PR to confirm. - The `check_run`-triggered comment update on `dotnet/maui` (the script itself is verified; the half-hourly sweep is the backup). - The `copilot-pat-pool` token selection in the new Opus workflow (the fork used a single secret). --------- Co-authored-by: Copilot CI <copilot-ci@microsoft.com>
…dotnet#40305) <!-- 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! ### Target Branch - [x] I selected the applicable base branch using the [contribution guide](https://github.com/dotnet/maui/blob/main/.github/CONTRIBUTING.md#choose-your-pr-base-before-starting). CI and workflow infrastructure, so it targets `main`. The slash command activates only once the workflow is on the default branch. ### Description of Change Adds `/review run-tests`. Two AI models, **GPT-6.1 Sol** and **Claude Opus 5.5**, each read the PR diff independently and pick the UI test categories and platforms it can affect. `maui-pr-uitests` then runs **only the union of their picks**. A CollectionView-only Android fix runs the CollectionView shards on Android, not all 77 categories on 4 platforms. Replaces dotnet#40253. **When what runs** | Trigger | What runs | | --- | --- | | `/review run-tests` on any PR (write access) | Only what the models selected: the per-platform union of both picks | | Both models choose the full suite (e.g. core `Element` changes) | Full suite | | Neither model produces a pick | Nothing is queued; the comment says so | | `/azp run maui-pr-uitests` | Full suite, unchanged | | Branch, scheduled and manual builds (`main`, `release/*`, `candidate/*`, …) | Full suite, unchanged. `ci-uitests.yml` only passes a selection when `Build.SourceBranch` is `refs/pull/*`. | Nothing is ever added that a model did not choose: no full-suite fallback, unknown category names run nothing, Android and the Material3 lane run only when selected (also enforced in the pipeline template), and only the five declared proposal fields are read. **What the requester sees** 1. **Native checks in the PR's checks list.** `maui-pr-uitests` is queued through the Build API as a *pull-request* build (`reason=pullRequest` + `triggerInfo.pr.sourceSha`), so Azure Pipelines reports the run and every job as checks on the PR head, exactly like `/azp run`. 2. **Skipped checks for everything not selected.** One `maui-pr-uitests (skipped) <Category>` check per category and one `maui-pr-uitests (skipped) <Platform> UITests` check per platform, plus a `maui-pr-uitests (test selection)` summary check. 3. **A summary comment in the PR Test Gate layout:** title, requester line and Result / Platforms / Categories / Commit badges, with everything else in one collapsed **Test selection** section: build status, each model's summary, what ran, results with failed tests, the skipped list, and **Why these tests** with a per-platform table of each model's pick and both rationales. `review-run-tests-results.yml` updates it in place when the `maui-pr-uitests` check completes, with a half-hourly sweep as backup. **How it works** | Piece | Role | | --- | --- | | `copilot-review-run-tests.md` (gh-aw, GPT-6.1 Sol) | Pre-activation authorizes an exact `/review run-tests` from a write+ user and collects the diff, the category inventory from `eng/pipelines/common/ui-tests.yml`, which categories have enabled tests per platform, and which the PR's own tests enable. The read-only agent (`checkout: false`) proposes platforms, categories, `full_run`, a summary and a rationale. The safe-output job saves the proposal and starts the Opus workflow. | | `copilot-review-run-tests-opus.md` (gh-aw, Claude Opus 5.5, new) | `workflow_dispatch` only. Verifies the source run (run-tests lock workflow, default branch, same repo, under 3 hours old), reuses its context artifact, and makes an independent proposal with the same shared prompt (`shared/run-tests-selection.md`). Then it starts the dispatcher with both run ids. If either agent fails, the chain still hands over. | | `review-run-tests-dispatch.yml` | `workflow_dispatch` on `main`, with **no environment**, so its OIDC subject is `repo:dotnet/maui:ref:refs/heads/main` like `review-trigger.yml`. Verifies both runs, downloads each proposal (a listed artifact that fails to download fails the job), checks each proposal's model and source run, and runs `Invoke-RunTests.ps1`. | | `Invoke-RunTests.ps1` | Trusted. Validates each proposal against the inventory, prunes each platform to categories with enabled tests there, and merges the two per platform. When every selected platform runs the same categories they are sent as plain names; otherwise every entry is platform-qualified (`android:Button`, `ios:Label`), never a mix. Re-checks the requester's permission, the PR head and its target branch, waits for a verified test-merge commit, queues the pull-request build and cancels it if Azure didn't apply the selection. Then publishes the Skipped and selection checks and the comment. | | `review-run-tests-results.yml` | Updates the comment when the `azure-pipelines` `maui-pr-uitests` check completes; sweeps every 30 minutes as backup. | | `eng/pipelines/**/ui-tests*.yml`, `ci-uitests.yml` | Optional `selectedRun`, `selectedPlatforms`, `selectedCategories` parameters filter stages and matrix entries at compile time. `CollectionView` and `Shell` expand to their shards; `<platform>:<Category>` limits a category to one platform, and every stage guard, including the dedicated Shell renderer, SafeAreaEdges, Material3 and Windows CV1 lanes, handles both the plain and the qualified form. The sample build gets template-evaluated booleans, never parameter text. Defaults expand to exactly `main`'s jobs. | | `review-trigger.yml`, `ReviewCommandHelpers.ps1`, rebalance skill | `/review run-tests` is excluded from `/review` and from recovery. `rebalance-ui-test-categories` understands the typed `categoryGroupsToTest` parameter. | `/azp run`, `/review`, `/review gate` and `/review tests` are unchanged. Device tests are out of scope. **Model policy exception:** the repo's GPT-only automation policy (`CopilotPipeline.Tests.ps1`, from dotnet#38040) gets one narrow exception: exactly `claude-opus-5.5`, only in the run-tests selection files (the Opus workflow and its lock file, the dispatcher, `RunTests.Common.ps1` and the tests). Any other Claude/Anthropic model, or that model anywhere else, still fails the test. Opus only proposes a selection; trusted code validates it, and it can only add tests, never remove the other model's picks. **Security review notes:** the new Opus workflow uses only existing secrets (the `COPILOT_PAT_0..9` pool via `copilot-pat-pool`); the dispatcher uses the existing `AZDO_TRIGGER_TENANT_ID` / `AZDO_TRIGGER_CLIENT_ID`. No new third-party actions. All actions are pinned by SHA. ### Validation **End to end in a fork (kubaflo/maui)** through the real GPT agent → Opus agent → dispatcher path, on 8 current PRs. All 24 workflow runs succeeded; each PR got the comment with both models' picks and the Skipped checks. Azure is skipped there because the fork has no federated identity. **Real builds on dotnet/maui.** Other PRs' merge refs don't have the new pipeline parameters until this merges, so each trial was a temporary draft PR: this branch plus one current PR's change. `Invoke-RunTests.ps1` ran locally with both models' proposals from the fork run on the same diff, queued `maui-pr-uitests`, and posted the comment. Every build got exactly the selected platforms and categories. | Trial | Copy of | GPT-6.1 Sol | Claude Opus 5.5 | Ran | Result | | --- | --- | --- | --- | --- | --- | | dotnet#40442 | dotnet#40369 Windows title bar | `Window` | + `TitleView`, `Lifecycle` | Windows, 3 categories | Passed in 39 min | | dotnet#40443 | dotnet#40366 Shell modal stack | `Shell1/2` on iOS, Mac | same | iOS + MacCatalyst | Passed | | dotnet#40444 | dotnet#40363 Android EmptyView | CollectionView + CarouselView | same | Android, 8 categories | Passed in 41 min | | dotnet#40445 | dotnet#40344 Shell tab reselect | `Shell1/2`, `Navigation` | + `TabbedPage` | All platforms, 4 categories | Running at time of writing | | dotnet#40446 | dotnet#40291 `DisplayPromptAsync` | Prompt, Alert, ActionSheet | same | All platforms, 3 categories | 1 test failed on MacCatalyst | | dotnet#40447 | dotnet#40234 `Element` / VSM threading | Full suite | Full suite | Full suite | Running at time of writing | | dotnet#40448 | dotnet#40385 CodeQL CI-only | Nothing | Nothing | Nothing (no build) | Comment only | | dotnet#40449 | dotnet#39487 Button corner radius | `Button`, `ImageButton` on iOS, Mac | same | iOS + MacCatalyst | 1 Button test failed | The failures are the same tests that failed in an earlier round on the same copied changes, so they come from those PRs, not the selection. The comments were refreshed from the real timelines and test results with `Update-RunTestsResults.ps1`. **Azure previews of this PR's merge ref:** - Defaults: identical to `main` (13 jobs, 157 matrix entries). - Android `Button`: 2 jobs, no Material3 lane. `Button` + `Material3`: the Material3 lane is included. - Qualified selections: `android:Material3` + `ios:Label` runs only the Material3 lane on Android; `android:Shell1` also runs the Shell renderer lane; `android:SafeAreaEdges` runs its dedicated lane; `windows:CollectionView1` runs the CV1 lane; an Android-only CollectionView pick never starts the Windows CV1 lane. - `selectedPlatforms` containing `"x; Remove-Item"`: only template booleans reach the build step. **Tests:** `RunTests.Tests.ps1` has 39 Pester tests covering the inventory and `#if` evaluator, pruning and qualification, the two-model union (one model empty, neither, full only when chosen), AI-only rules, the queue request and dropped-selection guard, the check plan, comment rendering and updates, and static template checks. The `ReviewTrigger`, `Recover-MissedReviewCommands` and `CopilotPipeline` suites pass. `gh aw compile --strict` succeeds. **Not verified before merge:** - The slash command and the dispatcher's OIDC exchange on `dotnet/maui` itself. GitHub only runs them from the default branch. After merge, comment `/review run-tests` on a PR to confirm. - The `check_run`-triggered comment update on `dotnet/maui` (the script itself is verified; the half-hourly sweep is the backup). - The `copilot-pat-pool` token selection in the new Opus workflow (the fork used a single secret). --------- Co-authored-by: Copilot CI <copilot-ci@microsoft.com>

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!
Issue Details
On Android, an empty horizontal CollectionView can log “requestLayout() improperly called … during layout” when a sibling control changes size. The Sandbox reproduction uses a CollectionView with a fixed height inside a vertical layout.
Root Cause
The EmptyView sizing code receives different dimensions during measure and arrange—for example, an infinite height constraint during measurement and a finite height during arrangement.
Each change updates the adapter dimensions and calls the EmptyView holder’s RequestLayout(). When this happens inside Android’s active layout pass, Android reports the improper-layout warning.
The likely introducing change was #33559
Description of Change
In ItemsViewHandler.Android.cs, replace both direct holder requests with:
PlatformInterop.RequestLayoutIfNeeded(itemView);This helper:
The change covers both an existing holder and a holder found by the deferred callback
Issues Fixed
Fixes #40308
Tested the behavior in the following platforms.
Screen.Recording.2026-11-18.at.11.41.53.AM.mov
After_Fix40308.mov