Skip to content

Commit 47d4adf

Browse files
Merge branch 'master' into fix/slider_text_null_error
* master: (115 commits) Roll Flutter Engine from 4adf453b6d68 to 19707e811b60 (1 revision) (flutter#149291) disable Impeller on external texture test. (flutter#149292) Roll Flutter Engine from 8d5d14a1db95 to 4adf453b6d68 (12 revisions) (flutter#149290) Update 3.22.1 release notes to include missing fix. (flutter#148999) Manual roll Flutter Engine from 60968ee3bde7 to 8d5d14a1db95 (1 revision) (flutter#149263) Reverts "Prevent LayoutBuilder from rebuilding more than once (flutter#147856)" (flutter#149279) Unskip expression evaluation test (flutter#149253) temporarily disable SemanticsAction tests to unblock engine change (flutter#149274) Adds benchmark for rrect_blur. (flutter#149261) Prevent LayoutBuilder from rebuilding more than once (flutter#147856) Add test for inherited_theme.0.dart (flutter#149120) Update progress_indicator.dart to indicate the adaptive option is for both macOS and iOS (flutter#145246) _ModalScopeStatus as InheritedModel (flutter#149022) Add test for radio.toggleable.0.dart (flutter#149153) Add a sentinel value for `TextStyle.height` (flutter#149049) Remove dynamic_layouts from issue template (flutter#149252) Roll Flutter Engine from 30aa720d4999 to 60968ee3bde7 (1 revision) (flutter#149255) Roll Flutter Engine from b26e1b023cdb to 30aa720d4999 (7 revisions) (flutter#149249) Roll Packages from a933c30 to 31d3329 (6 revisions) (flutter#149246) Clean leak in editable_text_test.dart. (flutter#149223) ...
2 parents 44b6937 + b295c86 commit 47d4adf

File tree

440 files changed

+6211
-3187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+6211
-3187
lines changed

.ci.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,7 @@ targets:
12941294

12951295
- name: Linux web_long_running_tests_2_5
12961296
recipe: flutter/flutter_drone
1297+
bringup: true
12971298
timeout: 60
12981299
properties:
12991300
dependencies: >-
@@ -3233,6 +3234,28 @@ targets:
32333234
["devicelab", "ios", "mac"]
32343235
task_name: animated_advanced_blend_perf_ios__timeline_summary
32353236

3237+
# Uses Impeller.
3238+
- name: Linux_pixel_7pro rrect_blur_perf__timeline_summary
3239+
recipe: devicelab/devicelab_drone
3240+
presubmit: false
3241+
bringup: true
3242+
timeout: 60
3243+
properties:
3244+
ignore_flakiness: "true"
3245+
tags: >
3246+
["devicelab", "android", "linux", "pixel", "7pro"]
3247+
task_name: rrect_blur_perf__timeline_summary
3248+
3249+
- name: Mac_ios rrect_blur_perf_ios__timeline_summary
3250+
recipe: devicelab/devicelab_drone
3251+
presubmit: false
3252+
bringup: true
3253+
timeout: 60
3254+
properties:
3255+
tags: >
3256+
["devicelab", "ios", "mac"]
3257+
task_name: rrect_blur_perf_ios__timeline_summary
3258+
32363259
# Uses Impeller.
32373260
- name: Linux_pixel_7pro animated_blur_backdrop_filter_perf_opengles__timeline_summary
32383261
recipe: devicelab/devicelab_drone
@@ -5455,6 +5478,7 @@ targets:
54555478
- .ci.yaml
54565479

54575480
- name: Windows plugin_test
5481+
bringup: true # Flaky https://github.com/flutter/flutter/issues/148834
54585482
recipe: devicelab/devicelab_drone
54595483
timeout: 60
54605484
properties:

.github/ISSUE_TEMPLATE/9_first_party_packages.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ body:
3232
- camera
3333
- cross_file
3434
- css_colors
35-
- dynamic_layouts
3635
- espresso
3736
- extension_google_sign_in_as_googleapis_auth
3837
- file_selector

.github/labeler.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ framework:
118118
- packages/flutter_test/**/*
119119
- packages/integration_test/**/*
120120
- examples/api/**/*
121+
- docs/about/**/*
121122
- docs/contributing/**/*
122123
- docs/libraries/**/*
123124

@@ -161,6 +162,8 @@ platform-web:
161162
team:
162163
- changed-files:
163164
- any-glob-to-any-file:
165+
- docs/about/**/*
166+
- docs/contributing/**/*
164167
- docs/postmortems/**/*
165168

166169
team-android:
@@ -188,8 +191,19 @@ team-release:
188191
- any-glob-to-any-file:
189192
- docs/releases/**/*
190193

194+
team-tool:
195+
- changed-files:
196+
- any-glob-to-any-file:
197+
- docs/tool/**/*
198+
199+
team-web:
200+
- changed-files:
201+
- any-glob-to-any-file:
202+
- docs/platforms/web/**/*
203+
191204
tool:
192205
- changed-files:
193206
- any-glob-to-any-file:
194207
- packages/flutter_tools/**/*
195208
- packages/fuchsia_remote_debug_protocol/**/*
209+
- docs/tool/**/*

TESTOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
/dev/devicelab/bin/tasks/dynamic_path_tessellation_perf__timeline_summary.dart @jonahwilliams @flutter/engine
107107
/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller__timeline_summary.dart @jonahwilliams @flutter/engine
108108
/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller_gles__timeline_summary.dart @jonahwilliams @flutter/engine
109+
/dev/devicelab/bin/tasks/rrect_blur_perf__timeline_summary.dart @gaaclarke @flutter/engine
109110

110111
## Windows Android DeviceLab tests
111112
/dev/devicelab/bin/tasks/basic_material_app_win__compile.dart @zanderso @flutter/tool
@@ -223,6 +224,7 @@
223224
/dev/devicelab/bin/tasks/draw_atlas_perf_ios__timeline_summary.dart @jonahwilliams @flutter/engine
224225
/dev/devicelab/bin/tasks/static_path_tessellation_perf_ios__timeline_summary.dart @jonahwilliams @flutter/engine
225226
/dev/devicelab/bin/tasks/dynamic_path_tessellation_perf_ios__timeline_summary.dart @jonahwilliams @flutter/engine
227+
/dev/devicelab/bin/tasks/rrect_blur_perf_ios__timeline_summary.dart @gaaclarke @flutter/engine
226228

227229
## Host only DeviceLab tests
228230
/dev/devicelab/bin/tasks/animated_complex_opacity_perf_macos__e2e_summary.dart @cbracken @flutter/desktop

bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c89defa558013d7790ab0fec0819c30fccae3aba
1+
19707e811b608b2ecf8633f26d534f7896b87c52

bin/internal/flutter_packages.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ba19b247d0bad15feed2ae31248b52ec0cf19785
1+
31d332900d98b05ac15096ace0bb7a76a8fb759d

bin/internal/fuchsia-linux.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
HHwlAJN5imwf3yX4i6DhvMFhgYzp7YIXIsEYuvsx9JEC
1+
c-Sm5-fy8c2YM7MykeRPbSf7GYgDkXFnDcNG89XheMkC

dev/a11y_assessments/lib/main.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ class App extends StatelessWidget {
2626
);
2727
return MaterialApp(
2828
title: 'Accessibility Assessments',
29-
theme: ThemeData(
30-
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
31-
useMaterial3: true,
32-
),
29+
theme: ThemeData.light(),
30+
darkTheme: ThemeData.dark(),
3331
routes: <String, WidgetBuilder>{
3432
'/': (_) => const HomePage(),
3533
...routes

dev/a11y_assessments/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1212
collection: 1.18.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1313
material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
14-
meta: 1.14.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
14+
meta: 1.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1515
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1616

1717
dev_dependencies:
@@ -38,4 +38,4 @@ dev_dependencies:
3838
flutter:
3939
uses-material-design: true
4040

41-
# PUBSPEC CHECKSUM: 8b62
41+
# PUBSPEC CHECKSUM: cf63
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import 'package:a11y_assessments/main.dart';
6+
import 'package:flutter/material.dart';
7+
import 'package:flutter_test/flutter_test.dart';
8+
9+
10+
void main() {
11+
testWidgets('Has light and dark theme', (WidgetTester tester) async {
12+
await tester.pumpWidget(const App());
13+
final MaterialApp app = find.byType(MaterialApp).evaluate().first.widget as MaterialApp;
14+
expect(app.theme!.brightness, equals(Brightness.light));
15+
expect(app.darkTheme!.brightness, equals(Brightness.dark));
16+
});
17+
}

0 commit comments

Comments
 (0)