Skip to content

Reland 3: Display Features#93240

Merged
fluttergithubbot merged 8 commits intoflutter:masterfrom
andreidiaconu:reland_3_display_features
Nov 20, 2021
Merged

Reland 3: Display Features#93240
fluttergithubbot merged 8 commits intoflutter:masterfrom
andreidiaconu:reland_3_display_features

Conversation

@andreidiaconu
Copy link
Contributor

@andreidiaconu andreidiaconu commented Nov 8, 2021 •
edited
Loading

This reverts commit 2468f31.

List which issues are fixed by this PR

Pre-launch Checklist

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

@flutter-dashboard flutter-dashboard bot added a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos documentation engine flutter/engine related. See also e: labels. f: integration_test The flutter/packages/integration_test plugin c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Nov 8, 2021
@google-cla google-cla bot added the cla: yes label Nov 8, 2021
@andreidiaconu andreidiaconu mentioned this pull request Nov 8, 2021
Merged
8 tasks
@skia-gold
Copy link

skia-gold commented Nov 8, 2021

Gold has detected about 22 new digest(s) on patchset 1.
View them at https://flutter-gold.skia.org/cl/github/93240

@andreidiaconu
Merge branch 'master' into reland_3_display_features
2468045 
# Conflicts:
#	bin/internal/engine.version
@andreidiaconu andreidiaconu marked this pull request as ready for review November 10, 2021 09:49
@andreidiaconu andreidiaconu mentioned this pull request Nov 10, 2021
Merged
@andreidiaconu
Copy link
Contributor Author

andreidiaconu commented Nov 10, 2021 •
edited
Loading

I am not sure why, but one of the tests fails, unrelated to the changes in this PR.

Test output is
Failed assertion: line 150 pos 14: 'diff.inMilliseconds > -1': timeDiffs were: [0:00:00.015618, 0:00:00.026335, 0:00:00.010335, 0:00:00.009855, 0:00:00.009491, 0:00:00.009163, 0:00:00.001837] (offending time was -1ms)

From what I can gather, one of the Durations in that array is below -1, measured in milliseconds - but all the Durations seem positive from the output. This PR is running with an older engine at this point, so perhaps that has something to do with it. Is this by any chance a flaky test?

@blasten could you please advise?

Nevermind, I see that check passes now.

@andreidiaconu
Merge branch 'master' into reland_3_display_features
f27f062 
# Conflicts:
#	bin/internal/engine.version
@Piinks Piinks self-requested a review November 16, 2021 20:03
@Piinks Piinks mentioned this pull request Nov 17, 2021
Merged
8 tasks
@andreidiaconu
Copy link
Contributor Author

andreidiaconu commented Nov 20, 2021 •
edited
Loading

@Piinks I see you added yourself as a reviewer. flutter/engine#29585 was merged. I updated the engine version, but the tree is currently broken.

@zanderso zanderso mentioned this pull request Nov 20, 2021
Closed
blasten
blasten approved these changes Nov 20, 2021
View reviewed changes
Copy link

@blasten blasten left a comment

Choose a reason for hiding this comment

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

LGTM

@andreidiaconu
Merge branch 'master' into reland_3_display_features
c31637a 
# Conflicts:
#	bin/internal/engine.version
@andreidiaconu
Copy link
Contributor Author

andreidiaconu commented Nov 20, 2021

Resolved the conflict in engine.version but I assume that #93975 and flutter/engine#29868 need to be closed before this.

@jason-simmons
Copy link
Member

jason-simmons commented Nov 20, 2021

Merged flutter/engine#29868

@andreidiaconu Can you update engine.version in this PR to flutter/engine@30eb4d6?

@fluttergithubbot fluttergithubbot merged commit 924336f into flutter:master Nov 20, 2021
@andreidiaconu
Copy link
Contributor Author

andreidiaconu commented Nov 21, 2021

It was already very late on my side. Thank you for everything!

@Piinks
Copy link
Contributor

Piinks commented Nov 22, 2021

@Piinks I see you added yourself as a reviewer. flutter/engine#29585 was merged. I updated the engine version, but the tree is currently broken.

Thanks @andreidiaconu! Glad this has been merged. I've been adding myself to keep track of all the various parts. Thanks for all of your hard work on this! :)

@renyou renyou mentioned this pull request Nov 29, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Piinks Piinks Awaiting requested review from Piinks

1 more reviewer

@blasten blasten blasten approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) c: contributor-productivity Team-specific productivity, code health, technical debt. d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos engine flutter/engine related. See also e: labels. f: integration_test The flutter/packages/integration_test plugin tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@andreidiaconu @skia-gold @jason-simmons @Piinks @blasten @zanderso @fluttergithubbot