Skip to content

Commit 3036b33

Browse files
hello-coder-xuhello-coder-xu
committed
Merge branch 'master' into fix/pageController_get_value_error
* master: (181 commits) Fix the scrolling layout deviation of `CupertinoActionSheet` (flutter#149439) Roll Flutter Engine from 60a7bb2353b6 to a6aa5d826649 (2 revisions) (flutter#149627) Roll Flutter Engine from ea72558be758 to 60a7bb2353b6 (2 revisions) (flutter#149623) Place `flutter_gpu` in the package cache. (flutter#149299) Switch to triage-* labels for platform package triage (flutter#149614) Roll pub packages (flutter#149617) Fixes multi line textfield hint text gets ellipsized (flutter#148423) Support failures-only and silent reporters in `flutter test` (flutter#148739) [CupertinoActionSheet] Fix overflow of the overscroll section when the user scrolls far (flutter#149542) Fix InputDecorator.prefixIcon color when disabled (flutter#149595) Added filter callback on dropdown menu (flutter#143939) update generated localized message files in the stocks test app (flutter#148741) Add a simplified SimpleCascadingMenuApp example (flutter#149147) Reland "Prevent LayoutBuilder from rebuilding more than once (flutter#147856)" (flutter#149303) Move some benchmarks from MotoG4 to Mokey (flutter#149567) Roll Packages from d8e8e8c to 11e192a (2 revisions) (flutter#149596) Cleanup triage reports from docs/ (flutter#149545) Roll Flutter Engine from d81edf635a9f to ea72558be758 (1 revision) (flutter#149590) Roll Flutter Engine from b0f4d7459708 to d81edf635a9f (1 revision) (flutter#149468) Roll Flutter Engine from 40b868efcc46 to b0f4d7459708 (1 revision) (flutter#149467) ...
2 parents 6f65f52 + c246ecd commit 3036b33

File tree

523 files changed

+10240
-14818
lines changed

Some content is hidden

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

523 files changed

+10240
-14818
lines changed

‎.ci.yaml‎

Lines changed: 161 additions & 108 deletions
Large diffs are not rendered by default.

‎.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/**/*

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ jobs:
5151

5252
# Upload the results to GitHub's code scanning dashboard.
5353
- name: "Upload to code-scanning"
54-
uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276
54+
uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f
5555
with:
5656
sarif_file: results.sarif

‎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+
a6aa5d826649c0607c2a19f4ca90ab2b43e2ecde

‎bin/internal/flutter_packages.version‎

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

‎bin/internal/fuchsia-linux.version‎

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

‎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/lib/use_cases/text_button.dart‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,25 @@ class MainWidgetState extends State<MainWidget> {
3939
child: Column(
4040
mainAxisAlignment: MainAxisAlignment.center,
4141
children: <Widget>[
42-
TextButton(
43-
onPressed: () { },
44-
child: const Text('Text button'),
42+
Row(
43+
mainAxisAlignment: MainAxisAlignment.center,
44+
children: <Widget>[
45+
const Text('This is a TextButton:'),
46+
TextButton(
47+
onPressed: () { },
48+
child: const Text('Action'),
49+
),
50+
],
4551
),
46-
const TextButton(
47-
onPressed: null,
48-
child: Text('Text button disabled'),
52+
const Row(
53+
mainAxisAlignment: MainAxisAlignment.center,
54+
children: <Widget>[
55+
Text('This is a disabled TextButton:'),
56+
TextButton(
57+
onPressed: null,
58+
child: Text('Action'),
59+
),
60+
],
4961
),
5062
],
5163
),

0 commit comments

Comments
 (0)