Skip to content

Commit 74fa6d2

Browse files
Merge branch 'fix/slider_text_null_error' of https://github.com/hello-coder-xu/flutter into fix/slider_text_null_error
* 'fix/slider_text_null_error' of https://github.com/hello-coder-xu/flutter: (65 commits) Change implementation method fix slider text null error Make FileSystem dependency explicit througout (more). (flutter#148095) Remove add-to-app bitcode warning (flutter#148587) SelectionArea's selection should not be cleared on loss of window focus (flutter#148067) [wiki migration] Engine team pages (flutter#148696) Manual roll camera dependency (flutter#148426) [wiki migration] Framework team pages (flutter#148721) Roll Flutter Engine from a8fb9daae8d0 to c2ef01f6f1ab (3 revisions) (flutter#148722) Bump github/codeql-action from 3.25.5 to 3.25.6 (flutter#148715) Bump codecov/codecov-action from 4.4.0 to 4.4.1 (flutter#148714) Fixes incorrect read/write permissions on Flutter.framework and FlutterMacOS.framework (flutter#148580) Roll Flutter Engine from c6fecf65fbf3 to a8fb9daae8d0 (3 revisions) (flutter#148700) Remove the no-shuffle tag on the flutter_tools create_test suite (flutter#148688) log incoming vm service messages in `FlutterVMService::runInView` (flutter#148596) Add tests for shared_app_data.#.dart API examples. (flutter#147830) Add tests for logical_key_set.0.dart API example. (flutter#147735) [wiki migration] Ecosystem team pages (flutter#148589) Fix painting API examples tests directories structure. (flutter#148177) fixes `CupertinoModalPopupRoute` (flutter#147823) ...
2 parents 8a20781 + cf43def commit 74fa6d2

File tree

381 files changed

+37555
-1398
lines changed

Some content is hidden

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

381 files changed

+37555
-1398
lines changed

.ci.yaml

Lines changed: 24 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,6 @@ platform_properties:
8888
os: Linux
8989
device_type: "Pixel 7 Pro"
9090

91-
linux_samsung_a02:
92-
properties:
93-
dependencies: >-
94-
[
95-
{"dependency": "android_sdk", "version": "version:34v3"},
96-
{"dependency": "open_jdk", "version": "version:17"},
97-
{"dependency": "curl", "version": "version:7.64.0"}
98-
]
99-
os: Linux
100-
device_type: "SM-A025V"
101-
10291
linux_mokey:
10392
properties:
10493
dependencies: >-
@@ -2712,16 +2701,16 @@ targets:
27122701
["devicelab", "android", "linux"]
27132702
task_name: list_text_layout_perf__e2e_summary
27142703

2715-
# linux a02s benchmark
2716-
- name: Linux_samsung_a02 list_text_layout_impeller_perf__e2e_summary
2704+
# linux mokey benchmark
2705+
- name: Linux_mokey list_text_layout_impeller_perf__e2e_summary
27172706
recipe: devicelab/devicelab_drone
27182707
presubmit: false
2719-
bringup: true
2708+
bringup: true # Device exists only in staging.
27202709
timeout: 60
27212710
properties:
27222711
ignore_flakiness: "true"
27232712
tags: >
2724-
["devicelab", "android", "linux", "samsung", "a02"]
2713+
["devicelab", "android", "linux", "mokey"]
27252714
task_name: list_text_layout_impeller_perf__e2e_summary
27262715

27272716
- name: Linux_pixel_7pro native_assets_android
@@ -2821,41 +2810,43 @@ targets:
28212810
["devicelab", "android", "linux", "mokey"]
28222811
task_name: new_gallery_impeller__transition_perf
28232812

2824-
# Mokey, Skia
2825-
- name: Linux_mokey new_gallery__transition_perf
2813+
# Mokey, Impeller (OpenGL)
2814+
- name: Linux_mokey new_gallery_opengles_impeller__transition_perf
28262815
recipe: devicelab/devicelab_drone
28272816
bringup: true # Device exists only in staging.
28282817
presubmit: false
28292818
timeout: 60
28302819
properties:
28312820
tags: >
28322821
["devicelab", "android", "linux", "mokey"]
2833-
task_name: new_gallery__transition_perf
2822+
task_name: new_gallery_opengles_impeller__transition_perf
28342823

2835-
# Pixel 7 Pro, Skia
2836-
- name: Linux_pixel_7pro new_gallery__transition_perf
2824+
# Mokey, Skia
2825+
- name: Linux_mokey new_gallery__transition_perf
28372826
recipe: devicelab/devicelab_drone
2827+
bringup: true # Device exists only in staging.
28382828
presubmit: false
28392829
timeout: 60
28402830
properties:
28412831
tags: >
2842-
["devicelab", "android", "linux", "pixel", "7pro"]
2832+
["devicelab", "android", "linux", "mokey"]
28432833
task_name: new_gallery__transition_perf
28442834

2845-
# Samsung A02, Skia
2846-
- name: Linux_samsung_a02 new_gallery__transition_perf
2835+
# Pixel 7 Pro, Skia
2836+
- name: Linux_pixel_7pro new_gallery__transition_perf
28472837
recipe: devicelab/devicelab_drone
28482838
presubmit: false
28492839
timeout: 60
28502840
properties:
28512841
tags: >
2852-
["devicelab", "android", "linux", "samsung", "a02"]
2842+
["devicelab", "android", "linux", "pixel", "7pro"]
28532843
task_name: new_gallery__transition_perf
28542844

28552845
# linux motog4 benchmark
28562846
# Moto G4, Impeller (OpenGL)
28572847
- name: Linux_android new_gallery_opengles_impeller__transition_perf
28582848
recipe: devicelab/devicelab_drone
2849+
bringup: true
28592850
presubmit: false
28602851
timeout: 60
28612852
properties:
@@ -2884,16 +2875,6 @@ targets:
28842875
["devicelab", "android", "linux", "pixel", "7pro"]
28852876
task_name: new_gallery_impeller__transition_perf
28862877

2887-
# Samsung A02, Impeller (Vulkan)
2888-
- name: Linux_samsung_a02 new_gallery_impeller__transition_perf
2889-
recipe: devicelab/devicelab_drone
2890-
presubmit: false
2891-
timeout: 60
2892-
properties:
2893-
tags: >
2894-
["devicelab", "android", "linux", "samsung", "a02"]
2895-
task_name: new_gallery_impeller__transition_perf
2896-
28972878
# Pixel 7 Pro, Impeller (OpenGL)
28982879
- name: Linux_pixel_7pro new_gallery_opengles_impeller__transition_perf
28992880
recipe: devicelab/devicelab_drone
@@ -2999,16 +2980,16 @@ targets:
29992980
["devicelab", "android", "linux", "pixel", "7pro"]
30002981
task_name: platform_views_scroll_perf__timeline_summary
30012982

3002-
# linux a02s benchmark
3003-
- name: Linux_samsung_a02 platform_views_scroll_perf_impeller__timeline_summary
3004-
bringup: true
2983+
# linux mokey benchmark
2984+
- name: Linux_mokey platform_views_scroll_perf_impeller__timeline_summary
2985+
bringup: true # Device exists only in staging.
30052986
recipe: devicelab/devicelab_drone
30062987
presubmit: false
30072988
timeout: 60
30082989
properties:
30092990
ignore_flakiness: "true"
30102991
tags: >
3011-
["devicelab", "android", "linux", "samsung", "a02"]
2992+
["devicelab", "android", "linux", "mokey"]
30122993
task_name: platform_views_scroll_perf_impeller__timeline_summary
30132994

30142995
- name: Linux_pixel_7pro platform_views_scroll_perf_impeller__timeline_summary
@@ -3199,16 +3180,16 @@ targets:
31993180
["devicelab", "android", "linux", "pixel", "7pro"]
32003181
task_name: android_choreographer_do_frame_test
32013182

3202-
# linux a02s benchmark
3203-
- name: linux_samsung_a02 animated_blur_backdrop_filter_perf__timeline_summary
3183+
# linux mokey benchmark
3184+
- name: Linux_mokey animated_blur_backdrop_filter_perf__timeline_summary
32043185
recipe: devicelab/devicelab_drone
32053186
presubmit: false
3206-
bringup: true
3187+
bringup: true # Device exists only in staging.
32073188
timeout: 60
32083189
properties:
32093190
ignore_flakiness: "true"
32103191
tags: >
3211-
["devicelab", "android", "linux", "samsung", "a02"]
3192+
["devicelab", "android", "linux", "mokey"]
32123193
task_name: animated_blur_backdrop_filter_perf__timeline_summary
32133194

32143195
# Uses Impeller.
@@ -4313,6 +4294,7 @@ targets:
43134294
task_name: microbenchmarks
43144295

43154296
- name: Mac_pixel_7pro native_assets_android
4297+
bringup: true # Flaky https://github.com/flutter/flutter/issues/148402
43164298
recipe: devicelab/devicelab_drone
43174299
presubmit: false
43184300
timeout: 60

.github/labeler.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,14 @@ engine:
5757
- changed-files:
5858
- any-glob-to-any-file:
5959
- bin/internal/engine.version
60+
- docs/engine/**/*
6061

6162
'f: cupertino':
6263
- changed-files:
6364
- any-glob-to-any-file:
6465
- '**/cupertino/*'
6566
- '**/*cupertino*'
67+
- docs/libraries/cupertino/**/*
6668

6769
'f: focus':
6870
- changed-files:
@@ -81,6 +83,7 @@ engine:
8183
- any-glob-to-any-file:
8284
- '**/material/*'
8385
- '**/*material*'
86+
- docs/libraries/material/**/*
8487

8588
'f: routes':
8689
- changed-files:
@@ -110,12 +113,19 @@ framework:
110113
- packages/flutter_test/**/*
111114
- packages/integration_test/**/*
112115
- examples/api/**/*
116+
- docs/contributing/**/*
117+
- docs/libraries/**/*
113118

114119
'f: integration_test':
115120
- changed-files:
116121
- any-glob-to-any-file:
117122
- packages/integration_test/**/*
118123

124+
package:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- docs/ecosystem/**/*
128+
119129
platform-ios:
120130
- changed-files:
121131
- any-glob-to-any-file:
@@ -138,6 +148,16 @@ platform-web:
138148
- '**/*.expect'
139149
- '**/*test_fixes*'
140150

151+
team-ecosystem:
152+
- changed-files:
153+
- any-glob-to-any-file:
154+
- docs/ecosystem/**/*
155+
156+
team-engine:
157+
- changed-files:
158+
- any-glob-to-any-file:
159+
- docs/engine/**/*
160+
141161
tool:
142162
- changed-files:
143163
- any-glob-to-any-file:

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
runs-on: ubuntu-latest
2020
if: ${{ github.repository == 'flutter/flutter' }}
2121
steps:
22-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
22+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
2323
- name: ./bin/flutter test --coverage
2424
run: pushd packages/flutter;../../bin/flutter test --coverage -j 1;popd
2525
- name: upload coverage
26-
uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17
26+
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c
2727
with:
2828
files: packages/flutter/coverage/lcov.info
2929
verbose: true

.github/workflows/easy-cp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.merge_commit_sha }})" >> $GITHUB_ENV
3232
- name: Checkout Flutter Repo
33-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
33+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
3434
with:
3535
repository: flutteractionsbot/flutter
3636
path: flutter

.github/workflows/minimal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020
- name: Checkout Flutter Repo
21-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
21+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
2222
with:
2323
repository: flutter/flutter
2424
token: ${{ github.token }}

.github/workflows/scorecards-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: "Checkout code"
26-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
26+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
2727
with:
2828
persist-credentials: false
2929

@@ -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@b7cec7526559c32f1616476ff32d17ba4c59b2d6
54+
uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276
5555
with:
5656
sarif_file: results.sarif

bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9e17588b330ca997f9989cfb63137425e74609b8
1+
c2ef01f6f1ab74f59b0ca27d6649f8a425a66d6f
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
87a02e393be00408b3cd2616e33a951312302653
1+
ba19b247d0bad15feed2ae31248b52ec0cf19785

bin/internal/fuchsia-linux.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Ftw7GopnudHydGS1yK5ztU-Pr2NtydAevV1eUHsuIt8C
1+
jXE7fqJI6VWFMaIdVFOYsP39O5i8wsvIrBGYhR35Y_EC

dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,10 @@ class AnimatedBezierState extends State<AnimatedBezier>
318318
..addListener(() {
319319
setState(() {});
320320
})
321-
..addStatusListener((AnimationStatus state) {
322-
if (state == AnimationStatus.completed) {
321+
..addStatusListener((AnimationStatus status) {
322+
if (status.isCompleted) {
323323
reverseAnimation();
324-
} else if (state == AnimationStatus.dismissed) {
324+
} else if (status.isDismissed) {
325325
playAnimation();
326326
}
327327
});

0 commit comments

Comments
 (0)