Remove Material imports from rendering editable tests by MarlonJD · Pull Request #186951 · flutter/flutter

MarlonJD · 2026-05-22T15:33:38Z

Removes the Material library dependency from rendering editable tests by replacing Material color constants with local Color values and switching the tests to widgets.dart. Also removes the fixed files from knownRenderingCrossImports.

Part of #177412
Refs #177028

No public API, runtime behavior, golden, or expectation changes.

Validation:

./bin/dart format --set-exit-if-changed dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart
./bin/dart --enable-asserts dev/bots/check_tests_cross_imports.dart
./bin/dart analyze dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart
./bin/flutter analyze --no-pub dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart
./bin/flutter test --no-pub packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart
git diff --check upstream/master...HEAD

MarlonJD · 2026-05-22T15:34:14Z

Maintainer label request: please add CICD. This PR is import-only rendering editable test cleanup and is locally verified per the PR body; no runtime behavior, public API, golden, or expectation changes.

gemini-code-assist

Code Review

This pull request removes the dependency on the material package in editable_gesture_test.dart and editable_test.dart by replacing Colors constants with local Color definitions and updating imports to use the widgets package. Consequently, these files are removed from the knownRenderingCrossImports list in check_tests_cross_imports.dart. I have no feedback to provide.

MarlonJD · 2026-05-23T08:05:46Z

@navaronbracke I addressed the color feedback in d10cf44a4e7: _red now uses Color(0xFFFF0000) in both rendering editable test files, and _blue uses Color(0xFF0000FF) in editable_test.dart.

Local verification passed:

dart format --output=none --set-exit-if-changed on the two touched rendering test files
bin/cache/dart-sdk/bin/dart --enable-asserts dev/bots/check_tests_cross_imports.dart
bin/flutter analyze --no-pub --no-fatal-infos packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart
bin/flutter test packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart

One repo-action note: the stale CICD label cleanup check failed while trying to remove the old label with 401 Bad credentials; I do not have label permissions to remove/re-add it myself. Google testing restarted and is currently in progress.

MarlonJD · 2026-05-23T09:55:06Z

Mac tool_integration_tests_3_5 timed out in an unrelated tool integration shard while the rest of presubmit is green. Could a Flutter team member rerun that check?

elliette

Thank you @MarlonJD ! Re-running the checks now. Could you please link an issue in the PR description? Thanks!

MarlonJD · 2026-05-27T20:16:19Z

Done, I added the issue links to the PR description:

Thanks!

flutter-dashboard · 2026-06-02T22:27:20Z

This pull request is not mergeable in its current state, likely because of a merge conflict. Pre-submit CI jobs were not triggered. Pushing a new commit to this branch that resolves the issue will result in pre-submit jobs being scheduled.

auto-submit · 2026-06-02T22:27:35Z

autosubmit label was removed for flutter/flutter/186951, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

MarlonJD · 2026-06-02T23:21:58Z

Resolved the merge conflict and pushed a new merge commit to the PR branch:

Commit: 6a42a5e3b1b chore: merge upstream master
PR is now reported as mergeable: true by GitHub.

Local checks:

dart format --output=none --set-exit-if-changed dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart passed.
git diff --check passed.

I also confirmed the conflict resolution keeps sliver_tree_test.dart in knownRenderingCrossImports from current master, while leaving the cleaned rendering editable tests out of that allowlist.

Note: targeted Flutter/package validation was blocked locally by dependency solving after the merge. The checkout SDK reported 3.44.0-1.0.pre-691, while the workspace dependency video_player_android 2.9.6 requires Flutter SDK >=3.44.0.

Roll Flutter from 2ba5420a7049 to 1bdf4af29076 (43 revisions) flutter/flutter@2ba5420...1bdf4af 2026-06-05 [email protected] Roll Packages from 03352b5 to 61bdbb4 (5 revisions) (flutter/flutter#187612) 2026-06-05 [email protected] Roll Skia from 6e003d7f69c8 to a47a9a2c8ae5 (1 revision) (flutter/flutter#187610) 2026-06-05 [email protected] Roll Dart SDK from aad8be4ce307 to 6a9a0efe66eb (10 revisions) (flutter/flutter#187609) 2026-06-05 [email protected] Roll Skia from 494f1bf55f51 to 6e003d7f69c8 (2 revisions) (flutter/flutter#187607) 2026-06-05 [email protected] Roll Fuchsia Linux SDK from ZE1Jy9CtVVi-tjBAE... to N_LiSaBSUsE2LDZgG... (flutter/flutter#187597) 2026-06-05 [email protected] Roll Skia from 59556fdb8c33 to 494f1bf55f51 (2 revisions) (flutter/flutter#187596) 2026-06-04 [email protected] Roll Skia from 8eb107046fd5 to 59556fdb8c33 (1 revision) (flutter/flutter#187590) 2026-06-04 [email protected] Remove `embedded_android_views_integration_test.dart` (flutter/flutter#187465) 2026-06-04 [email protected] Remove Material imports from rendering editable tests (flutter/flutter#186951) 2026-06-04 [email protected] [Impeller] Wait for the Vulkan device to become idle before destroying Vulkan objects in the AHBSwapchainImplVK destructor (flutter/flutter#187477) 2026-06-04 [email protected] [iOS] Eliminate unnecessary redeclaration of FlutterDisplayLink (flutter/flutter#187557) 2026-06-04 [email protected] Roll Skia from 928ded2a31af to 8eb107046fd5 (1 revision) (flutter/flutter#187583) 2026-06-04 [email protected] Log stdout in adb.dart (flutter/flutter#187531) 2026-06-04 [email protected] Clarify RouterDelegate popRoute bubbling (flutter/flutter#186875) 2026-06-04 [email protected] Roll Skia from 928ded2a31af to 8eb107046fd5 (1 revision) (flutter/flutter#187584) 2026-06-04 [email protected] Add updating-android-sdk agent skill for rolling Android SDK in CIPD (flutter/flutter#187576) 2026-06-04 [email protected] Fixing alignment issue (flutter/flutter#187518) 2026-06-04 [email protected] [Material Cross Imports] Clean up Material Divider usages (flutter/flutter#187300) 2026-06-04 [email protected] Roll Skia from cecc0e0da9ae to 928ded2a31af (6 revisions) (flutter/flutter#187574) 2026-06-04 [email protected] Use swift demangle to verify internal Swift symbols (flutter/flutter#186835) 2026-06-04 [email protected] Add android 37 platform and build tools to script for android cipd bundle creation (flutter/flutter#187571) 2026-06-04 [email protected] [Impeller] Increase the precision of the IPSampleWithTileModeOES coords parameter to match the input coordinates in the tiled_texture_fill_external shader (flutter/flutter#187545) 2026-06-04 [email protected] Roll Packages from b11504f to 03352b5 (4 revisions) (flutter/flutter#187569) 2026-06-04 [email protected] Roll Dart SDK to Dart 3.13 beta2 (flutter/flutter#187555) 2026-06-04 [email protected] Roll Skia from 611e3f8ceb93 to cecc0e0da9ae (1 revision) (flutter/flutter#187562) 2026-06-04 [email protected] Add step to bootstrap Flutter tool in coverage workflow (flutter/flutter#187199) 2026-06-04 [email protected] Roll Skia from 4fdb859c8da7 to 611e3f8ceb93 (4 revisions) (flutter/flutter#187554) 2026-06-04 [email protected] Roll Skia from 0020aae33f63 to 4fdb859c8da7 (2 revisions) (flutter/flutter#187552) 2026-06-04 [email protected] Roll Fuchsia Linux SDK from ap7MhLX4TdpWRrLS_... to ZE1Jy9CtVVi-tjBAE... (flutter/flutter#187550) 2026-06-04 [email protected] Add vector_math to package issue template (flutter/flutter#187536) 2026-06-04 [email protected] Manual roll Dart SDK from d39850bf4a01 to 3b70b98fa7c0 (flutter/flutter#187519) 2026-06-04 [email protected] Roll Skia from d625048c853a to 0020aae33f63 (20 revisions) (flutter/flutter#187539) 2026-06-04 [email protected] [Impeller][Windows] fix black screen on OpenGL fallback (flutter/flutter#187288) 2026-06-04 [email protected] Fix unintentionally joined path contours (flutter/flutter#187522) 2026-06-03 [email protected] fix: resolve issue #177379 by using lazy buildDirectory.dir() API in build.gradle template (flutter/flutter#187127) 2026-06-03 [email protected] Add a skill for flake analysis (flutter/flutter#187530) 2026-06-03 [email protected] adds linux impeller project flag (flutter/flutter#186982) 2026-06-03 [email protected] Add support for stylus buttons (flutter/flutter#183369) 2026-06-03 [email protected] Prevent Cubic transform from looping on out-of-range input (flutter/flutter#185875) 2026-06-03 [email protected] [Impeller] Reland: Allow attaching specific texture mip levels and slices (flutter/flutter#187470) 2026-06-03 [email protected] [skia] Update image deserial proc (flutter/flutter#185041) 2026-06-03 [email protected] docs: update Impeller advanced blend docs for framebuffer fetch (flutter/flutter#185457) 2026-06-03 [email protected] Handle#6537 fifth grouped tests (flutter/flutter#183720) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: ...

…r#11849) Roll Flutter from 2ba5420a7049 to 1bdf4af29076 (43 revisions) flutter/flutter@2ba5420...1bdf4af 2026-06-05 [email protected] Roll Packages from 03352b5 to 61bdbb4 (5 revisions) (flutter/flutter#187612) 2026-06-05 [email protected] Roll Skia from 6e003d7f69c8 to a47a9a2c8ae5 (1 revision) (flutter/flutter#187610) 2026-06-05 [email protected] Roll Dart SDK from aad8be4ce307 to 6a9a0efe66eb (10 revisions) (flutter/flutter#187609) 2026-06-05 [email protected] Roll Skia from 494f1bf55f51 to 6e003d7f69c8 (2 revisions) (flutter/flutter#187607) 2026-06-05 [email protected] Roll Fuchsia Linux SDK from ZE1Jy9CtVVi-tjBAE... to N_LiSaBSUsE2LDZgG... (flutter/flutter#187597) 2026-06-05 [email protected] Roll Skia from 59556fdb8c33 to 494f1bf55f51 (2 revisions) (flutter/flutter#187596) 2026-06-04 [email protected] Roll Skia from 8eb107046fd5 to 59556fdb8c33 (1 revision) (flutter/flutter#187590) 2026-06-04 [email protected] Remove `embedded_android_views_integration_test.dart` (flutter/flutter#187465) 2026-06-04 [email protected] Remove Material imports from rendering editable tests (flutter/flutter#186951) 2026-06-04 [email protected] [Impeller] Wait for the Vulkan device to become idle before destroying Vulkan objects in the AHBSwapchainImplVK destructor (flutter/flutter#187477) 2026-06-04 [email protected] [iOS] Eliminate unnecessary redeclaration of FlutterDisplayLink (flutter/flutter#187557) 2026-06-04 [email protected] Roll Skia from 928ded2a31af to 8eb107046fd5 (1 revision) (flutter/flutter#187583) 2026-06-04 [email protected] Log stdout in adb.dart (flutter/flutter#187531) 2026-06-04 [email protected] Clarify RouterDelegate popRoute bubbling (flutter/flutter#186875) 2026-06-04 [email protected] Roll Skia from 928ded2a31af to 8eb107046fd5 (1 revision) (flutter/flutter#187584) 2026-06-04 [email protected] Add updating-android-sdk agent skill for rolling Android SDK in CIPD (flutter/flutter#187576) 2026-06-04 [email protected] Fixing alignment issue (flutter/flutter#187518) 2026-06-04 [email protected] [Material Cross Imports] Clean up Material Divider usages (flutter/flutter#187300) 2026-06-04 [email protected] Roll Skia from cecc0e0da9ae to 928ded2a31af (6 revisions) (flutter/flutter#187574) 2026-06-04 [email protected] Use swift demangle to verify internal Swift symbols (flutter/flutter#186835) 2026-06-04 [email protected] Add android 37 platform and build tools to script for android cipd bundle creation (flutter/flutter#187571) 2026-06-04 [email protected] [Impeller] Increase the precision of the IPSampleWithTileModeOES coords parameter to match the input coordinates in the tiled_texture_fill_external shader (flutter/flutter#187545) 2026-06-04 [email protected] Roll Packages from b11504f to 03352b5 (4 revisions) (flutter/flutter#187569) 2026-06-04 [email protected] Roll Dart SDK to Dart 3.13 beta2 (flutter/flutter#187555) 2026-06-04 [email protected] Roll Skia from 611e3f8ceb93 to cecc0e0da9ae (1 revision) (flutter/flutter#187562) 2026-06-04 [email protected] Add step to bootstrap Flutter tool in coverage workflow (flutter/flutter#187199) 2026-06-04 [email protected] Roll Skia from 4fdb859c8da7 to 611e3f8ceb93 (4 revisions) (flutter/flutter#187554) 2026-06-04 [email protected] Roll Skia from 0020aae33f63 to 4fdb859c8da7 (2 revisions) (flutter/flutter#187552) 2026-06-04 [email protected] Roll Fuchsia Linux SDK from ap7MhLX4TdpWRrLS_... to ZE1Jy9CtVVi-tjBAE... (flutter/flutter#187550) 2026-06-04 [email protected] Add vector_math to package issue template (flutter/flutter#187536) 2026-06-04 [email protected] Manual roll Dart SDK from d39850bf4a01 to 3b70b98fa7c0 (flutter/flutter#187519) 2026-06-04 [email protected] Roll Skia from d625048c853a to 0020aae33f63 (20 revisions) (flutter/flutter#187539) 2026-06-04 [email protected] [Impeller][Windows] fix black screen on OpenGL fallback (flutter/flutter#187288) 2026-06-04 [email protected] Fix unintentionally joined path contours (flutter/flutter#187522) 2026-06-03 [email protected] fix: resolve issue #177379 by using lazy buildDirectory.dir() API in build.gradle template (flutter/flutter#187127) 2026-06-03 [email protected] Add a skill for flake analysis (flutter/flutter#187530) 2026-06-03 [email protected] adds linux impeller project flag (flutter/flutter#186982) 2026-06-03 [email protected] Add support for stylus buttons (flutter/flutter#183369) 2026-06-03 [email protected] Prevent Cubic transform from looping on out-of-range input (flutter/flutter#185875) 2026-06-03 [email protected] [Impeller] Reland: Allow attaching specific texture mip levels and slices (flutter/flutter#187470) 2026-06-03 [email protected] [skia] Update image deserial proc (flutter/flutter#185041) 2026-06-03 [email protected] docs: update Impeller advanced blend docs for framebuffer fetch (flutter/flutter#185457) 2026-06-03 [email protected] Handle#6537 fifth grouped tests (flutter/flutter#183720) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: ...

Removes the Material library dependency from rendering editable tests by replacing Material color constants with local Color values and switching the tests to widgets.dart. Also removes the fixed files from knownRenderingCrossImports. Part of flutter#177412 Refs flutter#177028 No public API, runtime behavior, golden, or expectation changes. Validation: - ./bin/dart format --set-exit-if-changed dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart - ./bin/dart --enable-asserts dev/bots/check_tests_cross_imports.dart - ./bin/dart analyze dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart - ./bin/flutter analyze --no-pub dev/bots/check_tests_cross_imports.dart packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart - ./bin/flutter test --no-pub packages/flutter/test/rendering/editable_gesture_test.dart packages/flutter/test/rendering/editable_test.dart - git diff --check upstream/master...HEAD --------- Co-authored-by: Victor Sanni <[email protected]>

github-actions Bot added the framework flutter/packages/flutter repository. See also f: labels. label May 22, 2026

gemini-code-assist Bot reviewed May 22, 2026

View reviewed changes

victorsanni self-requested a review May 22, 2026 18:48

victorsanni added this to Test cross-imports Review Queue May 22, 2026

github-project-automation Bot moved this to Todo in Test cross-imports Review Queue May 22, 2026

victorsanni added the CICD Run CI/CD label May 22, 2026

navaronbracke requested changes May 22, 2026

View reviewed changes

Comment thread packages/flutter/test/rendering/editable_gesture_test.dart Outdated

Comment thread packages/flutter/test/rendering/editable_test.dart Outdated

Comment thread packages/flutter/test/rendering/editable_test.dart

MarlonJD requested a review from navaronbracke May 23, 2026 08:06

github-actions Bot removed the CICD Run CI/CD label May 23, 2026

navaronbracke previously approved these changes May 23, 2026

View reviewed changes

navaronbracke added the CICD Run CI/CD label May 23, 2026

MarlonJD added 2 commits May 26, 2026 17:12

Remove Material imports from rendering editable tests

0c87ac2

Use primary colors in rendering editable tests

7dab38a

Piinks force-pushed the codex/rendering-editable-no-material branch from 83f04ba to 7dab38a Compare May 26, 2026 22:12

github-actions Bot removed the CICD Run CI/CD label May 26, 2026

Piinks requested a review from elliette May 26, 2026 22:12

elliette added the CICD Run CI/CD label May 27, 2026

elliette reviewed May 27, 2026

View reviewed changes

victorsanni previously approved these changes May 29, 2026

View reviewed changes

victorsanni requested a review from elliette May 29, 2026 00:28

Piinks added CICD Run CI/CD and removed CICD Run CI/CD labels Jun 2, 2026

Piinks added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 2, 2026

auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 2, 2026

chore: merge upstream master

6a42a5e

MarlonJD dismissed stale reviews from victorsanni and navaronbracke via 6a42a5e June 2, 2026 23:17

github-actions Bot removed the CICD Run CI/CD label Jun 2, 2026

Merge branch 'master' into codex/rendering-editable-no-material

0ed7c5c

MarlonJD requested review from navaronbracke and victorsanni June 2, 2026 23:21

navaronbracke requested changes Jun 3, 2026

View reviewed changes

Comment thread dev/bots/check_tests_cross_imports.dart Outdated

fix(test): remove migrated rendering cross-import entry

9a92417

MarlonJD requested a review from navaronbracke June 3, 2026 07:09

Merge branch 'master' into codex/rendering-editable-no-material

d03eaa6

navaronbracke approved these changes Jun 3, 2026

View reviewed changes

Merge branch 'master' into codex/rendering-editable-no-material

9fb16ab

victorsanni added the CICD Run CI/CD label Jun 3, 2026

victorsanni approved these changes Jun 3, 2026

View reviewed changes

victorsanni added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 4, 2026

auto-submit Bot added this pull request to the merge queue Jun 4, 2026

Merged via the queue into flutter:master with commit e65ac62 Jun 4, 2026
174 checks passed

flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 4, 2026

github-project-automation Bot moved this from Todo to Done in Test cross-imports Review Queue Jun 4, 2026

MarlonJD deleted the codex/rendering-editable-no-material branch June 4, 2026 23:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove Material imports from rendering editable tests#186951

Remove Material imports from rendering editable tests#186951
auto-submit[bot] merged 7 commits into
flutter:masterfrom
MarlonJD:codex/rendering-editable-no-material

MarlonJD commented May 22, 2026 •

edited

Loading

Uh oh!

MarlonJD commented May 22, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MarlonJD commented May 23, 2026

Uh oh!

MarlonJD commented May 23, 2026

Uh oh!

elliette left a comment

Uh oh!

MarlonJD commented May 27, 2026

Uh oh!

flutter-dashboard Bot commented Jun 2, 2026

Uh oh!

auto-submit Bot commented Jun 2, 2026

Uh oh!

MarlonJD commented Jun 2, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

MarlonJD commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MarlonJD commented May 22, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MarlonJD commented May 23, 2026

Uh oh!

MarlonJD commented May 23, 2026

Uh oh!

elliette left a comment

Choose a reason for hiding this comment

Uh oh!

MarlonJD commented May 27, 2026

Uh oh!

flutter-dashboard Bot commented Jun 2, 2026

Uh oh!

auto-submit Bot commented Jun 2, 2026

Uh oh!

MarlonJD commented Jun 2, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MarlonJD commented May 22, 2026 •

edited

Loading