Skip to content

Conversation

@goderbauer
Copy link
Member

@goderbauer goderbauer commented Oct 5, 2020

This reverts commit a0a65fc.

Google failures were cased by marking _StandardBottomSheetState.close() as async in #67078:

https://github.com/flutter/flutter/pull/67078/files#diff-ad7e5ee7be5375e4242652ddc6448da7R2723

This changed the timing slightly in tests. Since there is no need for that method to be async, I am reverting that change to restore the old behavior. Additionally, I also cleaned up the nullability of Scaffold.geometryOf and _StandardBottomSheet.animationController to simplify the code.

See the last commit for changes over #67078.

@flutter-dashboard flutter-dashboard bot added f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. labels Oct 5, 2020
@goderbauer
Copy link
Member Author

/cc @a14n @Hixie @pcsosinski

Copy link
Contributor

@Hixie Hixie left a comment

Choose a reason for hiding this comment

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

RSLGTM

Comment on lines 2723 to 2715
Future<void> close() async {
void close() {
Copy link
Member Author

Choose a reason for hiding this comment

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

This was the reason for the google3 failure: In #67078 this method was marked async, which changes the timing slightly for tests. There's no need for it to be async, though. The main goal of this commit is to revert that.

Copy link
Contributor

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@a14n a14n left a comment

Choose a reason for hiding this comment

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

LGTM

@goderbauer
Copy link
Member Author

Landing, since the tree is actually green, but not reported properly (according to @jonahwilliams).

@goderbauer goderbauer merged commit c14ab91 into flutter:master Oct 5, 2020
@goderbauer goderbauer deleted the relandmaterialnnbd branch October 5, 2020 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants