Unverified Commit 579d2fba authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

Roll engine to c5a63d (#19288)

parent 7ebf2728
fed2ea458ed49088d33eddabc546ba56d600c717 c5a63d28bf3735569c8187753bc490d8351a8363
...@@ -307,6 +307,7 @@ List<FileSystemEntity> findPackages() { ...@@ -307,6 +307,7 @@ List<FileSystemEntity> findPackages() {
// TODO(ianh): Use a real YAML parser here // TODO(ianh): Use a real YAML parser here
return !pubspec.readAsStringSync().contains('nodoc: true'); return !pubspec.readAsStringSync().contains('nodoc: true');
}) })
.cast<Directory>()
.toList(); .toList();
} }
......
...@@ -349,7 +349,8 @@ void _defineTests() { ...@@ -349,7 +349,8 @@ void _defineTests() {
)); ));
final Set<SemanticsAction> allActions = SemanticsAction.values.values.toSet() final Set<SemanticsAction> allActions = SemanticsAction.values.values.toSet()
..remove(SemanticsAction.showOnScreen); // showOnScreen is non user-exposed. ..remove(SemanticsAction.customAction) // customAction is not user-exposed.
..remove(SemanticsAction.showOnScreen); // showOnScreen is not user-exposed.
const int expectedId = 2; const int expectedId = 2;
final TestSemantics expectedSemantics = new TestSemantics.root( final TestSemantics expectedSemantics = new TestSemantics.root(
......
...@@ -415,7 +415,8 @@ void main() { ...@@ -415,7 +415,8 @@ void main() {
); );
final Set<SemanticsAction> allActions = SemanticsAction.values.values.toSet() final Set<SemanticsAction> allActions = SemanticsAction.values.values.toSet()
..remove(SemanticsAction.showOnScreen); // showOnScreen is non user-exposed. ..remove(SemanticsAction.customAction) // customAction is not user-exposed.
..remove(SemanticsAction.showOnScreen); // showOnScreen is not user-exposed.
const int expectedId = 1; const int expectedId = 1;
final TestSemantics expectedSemantics = new TestSemantics.root( final TestSemantics expectedSemantics = new TestSemantics.root(
......
...@@ -339,6 +339,7 @@ Matcher matchesSemanticsData({ ...@@ -339,6 +339,7 @@ Matcher matchesSemanticsData({
bool hasPasteAction = false, bool hasPasteAction = false,
bool hasDidGainAccessibilityFocusAction = false, bool hasDidGainAccessibilityFocusAction = false,
bool hasDidLoseAccessibilityFocusAction = false, bool hasDidLoseAccessibilityFocusAction = false,
bool hasCustomAction = false,
}) { }) {
final List<SemanticsFlag> flags = <SemanticsFlag>[]; final List<SemanticsFlag> flags = <SemanticsFlag>[];
if (hasCheckedState) if (hasCheckedState)
...@@ -405,6 +406,8 @@ Matcher matchesSemanticsData({ ...@@ -405,6 +406,8 @@ Matcher matchesSemanticsData({
actions.add(SemanticsAction.didGainAccessibilityFocus); actions.add(SemanticsAction.didGainAccessibilityFocus);
if (hasDidLoseAccessibilityFocusAction) if (hasDidLoseAccessibilityFocusAction)
actions.add(SemanticsAction.didLoseAccessibilityFocus); actions.add(SemanticsAction.didLoseAccessibilityFocus);
if (hasCustomAction)
actions.add(SemanticsAction.customAction);
return new _MatchesSemanticsData( return new _MatchesSemanticsData(
label: label, label: label,
......
...@@ -472,6 +472,7 @@ void main() { ...@@ -472,6 +472,7 @@ void main() {
hasPasteAction: true, hasPasteAction: true,
hasDidGainAccessibilityFocusAction: true, hasDidGainAccessibilityFocusAction: true,
hasDidLoseAccessibilityFocusAction: true, hasDidLoseAccessibilityFocusAction: true,
hasCustomAction: true,
)); ));
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment