Skip to content

Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute (2)#161577

Merged
auto-submit[bot] merged 3 commits intoflutter:masterfrom
chika3742:cupertino-page-transition-2
Jan 22, 2025
Merged

Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute (2)#161577
auto-submit[bot] merged 3 commits intoflutter:masterfrom
chika3742:cupertino-page-transition-2

Conversation

@chika3742
Copy link
Contributor

@chika3742 chika3742 commented Jan 14, 2025 •
edited
Loading

Original PR: #160241 (reverted in #161555 due to regression ), closes #29068

In addition to the original PR, this includes a fix for the integration test failure of flutter_gallery/transitions_perf_e2e. Error log is here. Tested locally on iOS real device and confirmed it passes.

It seems that the next operation of the test was performed before the page animation was finished because the PR makes the page transition duration longer.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@github-actions github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: material design flutter/packages/flutter/material repository. f: cupertino flutter/packages/flutter/cupertino repository f: routes Navigator, Router, and related APIs. labels Jan 14, 2025
@chika3742 chika3742 changed the title (2) Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute (2) Jan 14, 2025
@chika3742 chika3742 marked this pull request as ready for review January 14, 2025 09:14
MitchellGoodwin
MitchellGoodwin reviewed Jan 16, 2025
View reviewed changes
Copy link
Contributor

@MitchellGoodwin MitchellGoodwin left a comment

Choose a reason for hiding this comment

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

Thanks for jumping on this so fast! Left a comment about the pump length. Approach lgtm.

dev/integration_tests/flutter_gallery/test_driver/run_demos.dart Outdated
// This time is questionable. 400ms is the tested reasonable result.
await controller.pump(const Duration(milliseconds: 400));
// This time is questionable. 500ms is the tested reasonable result.
await controller.pump(const Duration(milliseconds: 500));
Copy link
Contributor

@MitchellGoodwin MitchellGoodwin Jan 16, 2025

Choose a reason for hiding this comment

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

Is 500 enough wiggle room? We went from a default duration for transitions from 300 to 500, so having the pump be for 500 seems kind of tight.

Copy link
Contributor Author

@chika3742 chika3742 Jan 17, 2025

Choose a reason for hiding this comment

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

Thank you for your review. Increased the pump duration to 600ms with room (cb7404b).

MitchellGoodwin
MitchellGoodwin approved these changes Jan 22, 2025
View reviewed changes
Copy link
Contributor

@MitchellGoodwin MitchellGoodwin left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you again for looking into this after the revert. It's really unfortunate that we can't catch things like that until after a merge sometimes.

chunhtai
chunhtai approved these changes Jan 22, 2025
View reviewed changes
Copy link
Contributor

@chunhtai chunhtai left a comment

Choose a reason for hiding this comment

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

LGTM

@MitchellGoodwin MitchellGoodwin added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 22, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Jan 22, 2025
Merged via the queue into flutter:master with commit c8e34e0 Jan 22, 2025
173 checks passed
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 22, 2025
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 22, 2025
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 22, 2025
@engine-flutter-autoroll
c8e34e0 Match CupertinoPageTransitionsBuilder animation duration to C…
660bc25 
…upertinoPageRoute (2) (flutter/flutter#161577)
@chika3742 chika3742 deleted the cupertino-page-transition-2 branch January 22, 2025 23:43
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 23, 2025
@engine-flutter-autoroll
Manual roll Flutter from b9e86a5 to b2f515f (42 revisions) (#8482)
b346343 
Manual roll Flutter from b9e86a5 to b2f515f (42 revisions)

Manual roll requested by [email protected]

flutter/flutter@b9e86a5...b2f515f

2025-01-22 [email protected] Roll Dart to Version 3.8.0-24.0.dev (flutter/flutter#162035)
2025-01-22 [email protected] `const AnimationStyle` (flutter/flutter#160564)
2025-01-22 [email protected] Add piping and bringup nodes for `_vulkan` and `_opengles` suites. (flutter/flutter#162020)
2025-01-22 [email protected] [Impeller] Migrate unit tests off of Skia geometry classes (flutter/flutter#161855)
2025-01-22 [email protected] Experiment with a `files-changed.json` per PR (flutter/flutter#161788)
2025-01-22 [email protected] Move FlKeyboardManager and FlKeyboardHandler from FlView to FlEngine. (flutter/flutter#161925)
2025-01-22 [email protected] Roll Packages from e8f1f63 to 3d3ab7b (1 revision) (flutter/flutter#162019)
2025-01-22 [email protected] Adds cupertino picker semantics test (flutter/flutter#161768)
2025-01-22 [email protected] [web] Remove deprecated web-only APIs from dart:ui (flutter/flutter#161775)
2025-01-22 [email protected] fix: Add enabled property for search anchor named constructor (flutter/flutter#161468)
2025-01-22 [email protected] Roll pub packages (flutter/flutter#162015)
2025-01-22 [email protected] [web] Remove spam from test output (flutter/flutter#161774)
2025-01-22 [email protected] Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute (2) (flutter/flutter#161577)
2025-01-22 [email protected] Make `font-subset` a standalone `run_tests.py` variant. (flutter/flutter#162016)
2025-01-22 [email protected] Enabled provisioning updates and device registration during building xcarchive. (flutter/flutter#159622)
2025-01-22 [email protected] [web] Remove HTML from bots, test suites and e2e tests (flutter/flutter#161537)
2025-01-22 [email protected] Expand the `.ci.yaml` and `builder.json` linter (flutter/flutter#161991)
2025-01-22 [email protected] Fix incorrect [enabled] documentation (flutter/flutter#161650)
2025-01-22 [email protected] Add `windows_host_engine_test`. (flutter/flutter#161992)
2025-01-22 [email protected] Roll Dart to version Version 3.8.0-19.0.dev (flutter/flutter#161989)
2025-01-22 [email protected] Deprecate `ThemeData.indicatorColor` in favor of `TabBarThemeData.indicatorColor` (flutter/flutter#160024)
2025-01-22 [email protected] [Impeller] disable older xclipse gpu driver. (flutter/flutter#161981)
2025-01-22 [email protected] Merge changelog for 3.27.3 release (flutter/flutter#161977)
2025-01-21 [email protected] Remove FlKeyboardViewDelegate (flutter/flutter#161705)
2025-01-21 [email protected] Fix documentation of Flow.clipBehavior (flutter/flutter#161863)
2025-01-21 [email protected] [impeller] prevent PowerVR from using Vulkan backend. (flutter/flutter#161841)
2025-01-21 [email protected] [Impeller] backfilling TextContents unit tests (flutter/flutter#161625)
2025-01-21 [email protected] Do not handle Dart isolate messages if the isolate is being shut down (flutter/flutter#161824)
2025-01-21 [email protected] fix failing lint : findByPath requires a specific ordering of project evaluation in `aar_init_script.gradle` (flutter/flutter#159301)
2025-01-21 [email protected] Get `et` working for local web engine builds. (flutter/flutter#161825)
2025-01-21 [email protected] Mark Linux_pixel_7pro flavors_test unflaky (flutter/flutter#160994)
2025-01-21 [email protected] Marks Mac_mokey run_debug_test_android to be flaky (flutter/flutter#161656)
2025-01-21 [email protected] Don't crash flutter tool if Chrome is not available (flutter/flutter#154941)
2025-01-21 [email protected] Fix DropdownMenu icon and item icon misalignment (flutter/flutter#161717)
2025-01-21 [email protected] [native assets] Cleanup dead code 2 (flutter/flutter#161916)
2025-01-21 [email protected] Update `ListTile` test to prevent log dump and test error message. (flutter/flutter#161811)
2025-01-21 [email protected] Roll pub packages (flutter/flutter#161924)
2025-01-21 [email protected] Make `PipelineOwner` a `base` class (flutter/flutter#161789)
2025-01-20 [email protected] [native assets] Cleanup dead code (flutter/flutter#161913)
2025-01-20 [email protected] Roll Packages from f73cb00 to e8f1f63 (9 revisions) (flutter/flutter#161914)
2025-01-20 [email protected] [ flutter_tool ] Fix flakiness in doctor_test.dart (flutter/flutter#161917)
2025-01-19 [email protected] Update documentation on what display information is provided. (flutter/flutter#161785)

If this roll has caused a breakage, revert this CL and stop the roller
...
Wasmund1 pushed a commit to Wasmund1/flutter that referenced this pull request Jan 24, 2025
@chika3742
Match CupertinoPageTransitionsBuilder animation duration to Cupertino…
41e888c 
…PageRoute (2) (flutter#161577)

Original PR: flutter#160241 (reverted in flutter#161555 due to regression ), closes
flutter#29068

In addition to the original PR, this includes a fix for the integration
test failure of
[flutter_gallery/transitions_perf_e2e](https://github.com/flutter/flutter/tree/1b0441c18ae0266ec62a66d846b6b38debc8f772/dev/integration_tests/flutter_gallery/test_driver).
Error log is
[here](https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8725826401212583777/+/u/run_flutter_gallery__transition_perf_e2e_ios/stdout).
Tested locally on iOS real device and confirmed it passes.

It seems that the next operation of the test was performed before the
page animation was finished because the PR makes the page transition
duration longer.

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
@Piinks Piinks mentioned this pull request Jan 24, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025
@engine-flutter-autoroll
c8e34e0 Match CupertinoPageTransitionsBuilder animation duration to C…
e2e19c6 
…upertinoPageRoute (2) (flutter/flutter#161577)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025
@engine-flutter-autoroll
c8e34e0 Match CupertinoPageTransitionsBuilder animation duration to C…
a344a8e 
…upertinoPageRoute (2) (flutter/flutter#161577)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 21, 2025
@engine-flutter-autoroll
c8e34e0 Match CupertinoPageTransitionsBuilder animation duration to C…
3412b6a 
…upertinoPageRoute (2) (flutter/flutter#161577)
androidseb pushed a commit to androidseb/packages that referenced this pull request Jun 8, 2025
@engine-flutter-autoroll @androidseb
Manual roll Flutter from b9e86a5 to b2f515f (42 revisions) (flutter#8482
3b38e95 
)

Manual roll Flutter from b9e86a5 to b2f515f (42 revisions)

Manual roll requested by [email protected]

flutter/flutter@b9e86a5...b2f515f

2025-01-22 [email protected] Roll Dart to Version 3.8.0-24.0.dev (flutter/flutter#162035)
2025-01-22 [email protected] `const AnimationStyle` (flutter/flutter#160564)
2025-01-22 [email protected] Add piping and bringup nodes for `_vulkan` and `_opengles` suites. (flutter/flutter#162020)
2025-01-22 [email protected] [Impeller] Migrate unit tests off of Skia geometry classes (flutter/flutter#161855)
2025-01-22 [email protected] Experiment with a `files-changed.json` per PR (flutter/flutter#161788)
2025-01-22 [email protected] Move FlKeyboardManager and FlKeyboardHandler from FlView to FlEngine. (flutter/flutter#161925)
2025-01-22 [email protected] Roll Packages from e8f1f63 to 3d3ab7b (1 revision) (flutter/flutter#162019)
2025-01-22 [email protected] Adds cupertino picker semantics test (flutter/flutter#161768)
2025-01-22 [email protected] [web] Remove deprecated web-only APIs from dart:ui (flutter/flutter#161775)
2025-01-22 [email protected] fix: Add enabled property for search anchor named constructor (flutter/flutter#161468)
2025-01-22 [email protected] Roll pub packages (flutter/flutter#162015)
2025-01-22 [email protected] [web] Remove spam from test output (flutter/flutter#161774)
2025-01-22 [email protected] Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute (2) (flutter/flutter#161577)
2025-01-22 [email protected] Make `font-subset` a standalone `run_tests.py` variant. (flutter/flutter#162016)
2025-01-22 [email protected] Enabled provisioning updates and device registration during building xcarchive. (flutter/flutter#159622)
2025-01-22 [email protected] [web] Remove HTML from bots, test suites and e2e tests (flutter/flutter#161537)
2025-01-22 [email protected] Expand the `.ci.yaml` and `builder.json` linter (flutter/flutter#161991)
2025-01-22 [email protected] Fix incorrect [enabled] documentation (flutter/flutter#161650)
2025-01-22 [email protected] Add `windows_host_engine_test`. (flutter/flutter#161992)
2025-01-22 [email protected] Roll Dart to version Version 3.8.0-19.0.dev (flutter/flutter#161989)
2025-01-22 [email protected] Deprecate `ThemeData.indicatorColor` in favor of `TabBarThemeData.indicatorColor` (flutter/flutter#160024)
2025-01-22 [email protected] [Impeller] disable older xclipse gpu driver. (flutter/flutter#161981)
2025-01-22 [email protected] Merge changelog for 3.27.3 release (flutter/flutter#161977)
2025-01-21 [email protected] Remove FlKeyboardViewDelegate (flutter/flutter#161705)
2025-01-21 [email protected] Fix documentation of Flow.clipBehavior (flutter/flutter#161863)
2025-01-21 [email protected] [impeller] prevent PowerVR from using Vulkan backend. (flutter/flutter#161841)
2025-01-21 [email protected] [Impeller] backfilling TextContents unit tests (flutter/flutter#161625)
2025-01-21 [email protected] Do not handle Dart isolate messages if the isolate is being shut down (flutter/flutter#161824)
2025-01-21 [email protected] fix failing lint : findByPath requires a specific ordering of project evaluation in `aar_init_script.gradle` (flutter/flutter#159301)
2025-01-21 [email protected] Get `et` working for local web engine builds. (flutter/flutter#161825)
2025-01-21 [email protected] Mark Linux_pixel_7pro flavors_test unflaky (flutter/flutter#160994)
2025-01-21 [email protected] Marks Mac_mokey run_debug_test_android to be flaky (flutter/flutter#161656)
2025-01-21 [email protected] Don't crash flutter tool if Chrome is not available (flutter/flutter#154941)
2025-01-21 [email protected] Fix DropdownMenu icon and item icon misalignment (flutter/flutter#161717)
2025-01-21 [email protected] [native assets] Cleanup dead code 2 (flutter/flutter#161916)
2025-01-21 [email protected] Update `ListTile` test to prevent log dump and test error message. (flutter/flutter#161811)
2025-01-21 [email protected] Roll pub packages (flutter/flutter#161924)
2025-01-21 [email protected] Make `PipelineOwner` a `base` class (flutter/flutter#161789)
2025-01-20 [email protected] [native assets] Cleanup dead code (flutter/flutter#161913)
2025-01-20 [email protected] Roll Packages from f73cb00 to e8f1f63 (9 revisions) (flutter/flutter#161914)
2025-01-20 [email protected] [ flutter_tool ] Fix flakiness in doctor_test.dart (flutter/flutter#161917)
2025-01-19 [email protected] Update documentation on what display information is provided. (flutter/flutter#161785)

If this roll has caused a breakage, revert this CL and stop the roller
...
FMorschel pushed a commit to FMorschel/packages that referenced this pull request Jun 9, 2025
@engine-flutter-autoroll @FMorschel
Manual roll Flutter from b9e86a5 to b2f515f (42 revisions) (flutter#8482
1e59947 
)

Manual roll Flutter from b9e86a5 to b2f515f (42 revisions)

Manual roll requested by [email protected]

flutter/flutter@b9e86a5...b2f515f

2025-01-22 [email protected] Roll Dart to Version 3.8.0-24.0.dev (flutter/flutter#162035)
2025-01-22 [email protected] `const AnimationStyle` (flutter/flutter#160564)
2025-01-22 [email protected] Add piping and bringup nodes for `_vulkan` and `_opengles` suites. (flutter/flutter#162020)
2025-01-22 [email protected] [Impeller] Migrate unit tests off of Skia geometry classes (flutter/flutter#161855)
2025-01-22 [email protected] Experiment with a `files-changed.json` per PR (flutter/flutter#161788)
2025-01-22 [email protected] Move FlKeyboardManager and FlKeyboardHandler from FlView to FlEngine. (flutter/flutter#161925)
2025-01-22 [email protected] Roll Packages from e8f1f63 to 3d3ab7b (1 revision) (flutter/flutter#162019)
2025-01-22 [email protected] Adds cupertino picker semantics test (flutter/flutter#161768)
2025-01-22 [email protected] [web] Remove deprecated web-only APIs from dart:ui (flutter/flutter#161775)
2025-01-22 [email protected] fix: Add enabled property for search anchor named constructor (flutter/flutter#161468)
2025-01-22 [email protected] Roll pub packages (flutter/flutter#162015)
2025-01-22 [email protected] [web] Remove spam from test output (flutter/flutter#161774)
2025-01-22 [email protected] Match CupertinoPageTransitionsBuilder animation duration to CupertinoPageRoute (2) (flutter/flutter#161577)
2025-01-22 [email protected] Make `font-subset` a standalone `run_tests.py` variant. (flutter/flutter#162016)
2025-01-22 [email protected] Enabled provisioning updates and device registration during building xcarchive. (flutter/flutter#159622)
2025-01-22 [email protected] [web] Remove HTML from bots, test suites and e2e tests (flutter/flutter#161537)
2025-01-22 [email protected] Expand the `.ci.yaml` and `builder.json` linter (flutter/flutter#161991)
2025-01-22 [email protected] Fix incorrect [enabled] documentation (flutter/flutter#161650)
2025-01-22 [email protected] Add `windows_host_engine_test`. (flutter/flutter#161992)
2025-01-22 [email protected] Roll Dart to version Version 3.8.0-19.0.dev (flutter/flutter#161989)
2025-01-22 [email protected] Deprecate `ThemeData.indicatorColor` in favor of `TabBarThemeData.indicatorColor` (flutter/flutter#160024)
2025-01-22 [email protected] [Impeller] disable older xclipse gpu driver. (flutter/flutter#161981)
2025-01-22 [email protected] Merge changelog for 3.27.3 release (flutter/flutter#161977)
2025-01-21 [email protected] Remove FlKeyboardViewDelegate (flutter/flutter#161705)
2025-01-21 [email protected] Fix documentation of Flow.clipBehavior (flutter/flutter#161863)
2025-01-21 [email protected] [impeller] prevent PowerVR from using Vulkan backend. (flutter/flutter#161841)
2025-01-21 [email protected] [Impeller] backfilling TextContents unit tests (flutter/flutter#161625)
2025-01-21 [email protected] Do not handle Dart isolate messages if the isolate is being shut down (flutter/flutter#161824)
2025-01-21 [email protected] fix failing lint : findByPath requires a specific ordering of project evaluation in `aar_init_script.gradle` (flutter/flutter#159301)
2025-01-21 [email protected] Get `et` working for local web engine builds. (flutter/flutter#161825)
2025-01-21 [email protected] Mark Linux_pixel_7pro flavors_test unflaky (flutter/flutter#160994)
2025-01-21 [email protected] Marks Mac_mokey run_debug_test_android to be flaky (flutter/flutter#161656)
2025-01-21 [email protected] Don't crash flutter tool if Chrome is not available (flutter/flutter#154941)
2025-01-21 [email protected] Fix DropdownMenu icon and item icon misalignment (flutter/flutter#161717)
2025-01-21 [email protected] [native assets] Cleanup dead code 2 (flutter/flutter#161916)
2025-01-21 [email protected] Update `ListTile` test to prevent log dump and test error message. (flutter/flutter#161811)
2025-01-21 [email protected] Roll pub packages (flutter/flutter#161924)
2025-01-21 [email protected] Make `PipelineOwner` a `base` class (flutter/flutter#161789)
2025-01-20 [email protected] [native assets] Cleanup dead code (flutter/flutter#161913)
2025-01-20 [email protected] Roll Packages from f73cb00 to e8f1f63 (9 revisions) (flutter/flutter#161914)
2025-01-20 [email protected] [ flutter_tool ] Fix flakiness in doctor_test.dart (flutter/flutter#161917)
2025-01-19 [email protected] Update documentation on what display information is provided. (flutter/flutter#161785)

If this roll has caused a breakage, revert this CL and stop the roller
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chunhtai chunhtai chunhtai approved these changes

+1 more reviewer

@MitchellGoodwin MitchellGoodwin MitchellGoodwin approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

f: cupertino flutter/packages/flutter/cupertino repository f: material design flutter/packages/flutter/material repository. f: routes Navigator, Router, and related APIs. framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

PageTransitionsTheme needs to account for transition duration as well

3 participants

@chika3742 @chunhtai @MitchellGoodwin