Merge branch 'master' into 110319_fix_cupertino_date_picker_column_width

flutter · Jul 6, 2024 · 747000f · 747000f
2 parents a653691 + fbd6890
commit 747000f
Show file tree

Hide file tree

Showing 301 changed files with 3,276 additions and 799 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -1155,35 +1155,9 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:17"}
-        ]
-      shard: android_preview_tool_integration_tests
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/flutter_tools/**
-      - bin/**
-      - .ci.yaml
-
-  - name: Linux android_java11_tool_integration_tests
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      dependencies: >-
-        [
-          {"dependency": "android_sdk", "version": "version:34v3"},
-          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
-          {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
-          {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
-          {"dependency": "ninja", "version": "version:1.9.0"},
           {"dependency": "open_jdk", "version": "version:11"}
         ]
-      shard: android_java11_tool_integration_tests
+      shard: android_preview_tool_integration_tests
       tags: >
         ["framework", "hostonly", "shard", "linux"]
       test_timeout_secs: "2700"

diff --git a/TESTOWNERS b/TESTOWNERS
@@ -332,8 +332,6 @@
 # test_ownership @keyonghan
 # tool_host_cross_arch_tests @andrewkolos @flutter/tool
 # tool_integration_tests @christopherfujino @flutter/tool
-# android_preview_tool_integration_tests @gmackall @flutter/android
-# android_java11_tool_integration_tests @gmackall @flutter/android
 # tool_tests @andrewkolos @flutter/tool
 # verify_binaries_codesigned @cbracken @flutter/releases
 # web_canvaskit_tests @yjbanov @flutter/web

diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-3456fee1a6b93b2b29f7517c99401352d8c46308
+4190543cb093590b006568881e603bf84ab344e6
diff --git a/bin/internal/flutter_packages.version b/bin/internal/flutter_packages.version
@@ -1 +1 @@
-412ec4615aa4f2b7180e89a08cb00a5e98e4789a
+d2705fb82b2605633e8528c053148128cc202327
diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version
@@ -1 +1 @@
-LkXpxHsQlkPT4mmJ7i9vS0-GQmceOV-FpTF-9wxfMFUC
+-VgqOfoW5sf04SuJh64NbuVnDIwiyl7NyTAD4fsTLNkC
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
@@ -1884,14 +1884,9 @@ Stream<File> _allFiles(String workingDirectory, String? extension, { required in
       if (_isGeneratedPluginRegistrant(entity)) {
         continue;
       }
-      if (path.basename(entity.path) == 'flutter_export_environment.sh') {
-        continue;
-      }
-      if (path.basename(entity.path) == 'gradlew.bat') {
-        continue;
-      }
-      if (path.basename(entity.path) == '.DS_Store') {
-        continue;
+      switch (path.basename(entity.path)) {
+        case 'flutter_export_environment.sh' || 'gradlew.bat' || '.DS_Store':
+          continue;
       }
       if (extension == null || path.extension(entity.path) == '.$extension') {
         matches += 1;
@@ -1901,23 +1896,9 @@ Stream<File> _allFiles(String workingDirectory, String? extension, { required in
       if (File(path.join(entity.path, '.dartignore')).existsSync()) {
         continue;
       }
-      if (path.basename(entity.path) == '.git') {
-        continue;
-      }
-      if (path.basename(entity.path) == '.idea') {
-        continue;
-      }
-      if (path.basename(entity.path) == '.gradle') {
-        continue;
-      }
-      if (path.basename(entity.path) == '.dart_tool') {
-        continue;
-      }
-      if (path.basename(entity.path) == '.idea') {
-        continue;
-      }
-      if (path.basename(entity.path) == 'build') {
-        continue;
+      switch (path.basename(entity.path)) {
+        case '.git' || '.idea' || '.gradle' || '.dart_tool' || 'build':
+          continue;
       }
       pending.addAll(entity.listSync());
     }

diff --git a/dev/bots/suite_runners/run_android_java11_integration_tool_tests.dart b/dev/bots/suite_runners/run_android_java11_integration_tool_tests.dart
diff --git a/dev/bots/test.dart b/dev/bots/test.dart
@@ -59,7 +59,6 @@ import 'package:path/path.dart' as path;
 import 'run_command.dart';
 import 'suite_runners/run_add_to_app_life_cycle_tests.dart';
 import 'suite_runners/run_analyze_tests.dart';
-import 'suite_runners/run_android_java11_integration_tool_tests.dart';
 import 'suite_runners/run_android_preview_integration_tool_tests.dart';
 import 'suite_runners/run_customer_testing_tests.dart';
 import 'suite_runners/run_docs_tests.dart';
@@ -132,7 +131,6 @@ Future<void> main(List<String> args) async {
       'web_tool_tests': _runWebToolTests,
       'tool_integration_tests': _runIntegrationToolTests,
       'android_preview_tool_integration_tests': androidPreviewIntegrationToolTestsRunner,
-      'android_java11_tool_integration_tests': androidJava11IntegrationToolTestsRunner,
       'tool_host_cross_arch_tests': _runToolHostCrossArchTests,
       // All the unit/widget tests run using `flutter test --platform=chrome --web-renderer=html`
       'web_tests': webTestsSuite.runWebHtmlUnitTests,

diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -1324,6 +1324,10 @@ class PerfTest {
       final String? localEngineSrcPath = localEngineSrcPathFromEnv;
 
       if (createPlatforms.isNotEmpty) {
+        // Ensure that the platform-specific manifests are freshly created and
+        // do not contain any settings from previous runs.
+        await exec('git', <String>['clean', '-f', testDirectory]);
+
         await flutter('create', options: <String>[
           '--platforms',
           createPlatforms.join(','),

diff --git a/dev/integration_tests/flutter_gallery/pubspec.yaml b/dev/integration_tests/flutter_gallery/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   string_scanner: 1.2.0
   url_launcher: 6.3.0
   cupertino_icons: 1.0.8
-  video_player: 2.9.0
+  video_player: 2.9.1
   scoped_model: 2.0.0
   shrine_images: 2.0.2
 
@@ -271,4 +271,4 @@ flutter:
       - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf
       - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf
 
-# PUBSPEC CHECKSUM: f518
+# PUBSPEC CHECKSUM: e619
diff --git a/dev/tools/gen_keycodes/data/keyboard_key.tmpl b/dev/tools/gen_keycodes/data/keyboard_key.tmpl
@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/widgets.dart';
+///
+/// @docImport 'raw_keyboard.dart';
+library;
+
 import 'package:flutter/foundation.dart';
 
 export 'package:flutter/foundation.dart' show DiagnosticPropertiesBuilder;

diff --git a/dev/tools/localization/bin/gen_date_localizations.dart b/dev/tools/localization/bin/gen_date_localizations.dart
@@ -164,61 +164,51 @@ String _jsonToMapEntry(String key, dynamic value) {
 }
 
 String _jsonToObject(dynamic json) {
-  if (json == null || json is num || json is bool) {
-    return '$json';
-  }
-
-  if (json is String) {
-    return generateEncodedString(currentLocale, json);
-  }
-
-  if (json is Iterable<Object?>) {
-    final String type = json.first.runtimeType.toString();
-    final StringBuffer buffer = StringBuffer('const <$type>[');
-    for (final dynamic value in json) {
-      buffer.writeln('${_jsonToMap(value)},');
-    }
-    buffer.write(']');
-    return buffer.toString();
-  }
-
-  if (json is Map<String, dynamic>) {
-    final StringBuffer buffer = StringBuffer('<String, Object>{');
-    json.forEach((String key, dynamic value) {
-      buffer.writeln(_jsonToMapEntry(key, value));
-    });
-    buffer.write('}');
-    return buffer.toString();
+  switch (json) {
+    case null || num() || bool():
+      return '$json';
+    case String():
+      return generateEncodedString(currentLocale, json);
+    case Iterable<Object?>():
+      final Type type = json.first.runtimeType;
+      final StringBuffer buffer = StringBuffer('const <$type>[');
+      for (final dynamic value in json) {
+        buffer.writeln('${_jsonToMap(value)},');
+      }
+      buffer.write(']');
+      return buffer.toString();
+    case Map<String, dynamic>():
+      final StringBuffer buffer = StringBuffer('<String, Object>{');
+      json.forEach((String key, dynamic value) {
+        buffer.writeln(_jsonToMapEntry(key, value));
+      });
+      buffer.write('}');
+      return buffer.toString();
   }
 
   throw 'Unsupported JSON type ${json.runtimeType} of value $json.';
 }
 
 String _jsonToMap(dynamic json) {
-  if (json == null || json is num || json is bool) {
-    return '$json';
-  }
-
-  if (json is String) {
-    return generateEncodedString(currentLocale, json);
-  }
-
-  if (json is Iterable) {
-    final StringBuffer buffer = StringBuffer('<String>[');
-    for (final dynamic value in json) {
-      buffer.writeln('${_jsonToMap(value)},');
-    }
-    buffer.write(']');
-    return buffer.toString();
-  }
-
-  if (json is Map<String, dynamic>) {
-    final StringBuffer buffer = StringBuffer('<String, Object>{');
-    json.forEach((String key, dynamic value) {
-      buffer.writeln(_jsonToMapEntry(key, value));
-    });
-    buffer.write('}');
-    return buffer.toString();
+  switch (json) {
+    case null || num() || bool():
+      return '$json';
+    case String():
+      return generateEncodedString(currentLocale, json);
+    case Iterable<dynamic>():
+      final StringBuffer buffer = StringBuffer('<String>[');
+      for (final dynamic value in json) {
+        buffer.writeln('${_jsonToMap(value)},');
+      }
+      buffer.write(']');
+      return buffer.toString();
+    case Map<String, dynamic>():
+      final StringBuffer buffer = StringBuffer('<String, Object>{');
+      json.forEach((String key, dynamic value) {
+        buffer.writeln(_jsonToMapEntry(key, value));
+      });
+      buffer.write('}');
+      return buffer.toString();
   }
 
   throw 'Unsupported JSON type ${json.runtimeType} of value $json.';

diff --git a/dev/tools/mega_gallery.dart b/dev/tools/mega_gallery.dart
@@ -148,17 +148,13 @@ void _copy(Directory source, Directory target) {
   for (final FileSystemEntity entity in source.listSync(followLinks: false)) {
     final String name = path.basename(entity.path);
 
-    if (entity is Directory) {
-      if (name == 'build' || name.startsWith('.')) {
-        continue;
-      }
-      _copy(entity, Directory(path.join(target.path, name)));
-    } else if (entity is File) {
-      if (name == '.packages' || name == 'pubspec.lock') {
-        continue;
-      }
-      final File dest = File(path.join(target.path, name));
-      dest.writeAsBytesSync(entity.readAsBytesSync());
+    switch (entity) {
+      case Directory() when name != 'build' && !name.startsWith('.'):
+        _copy(entity, Directory(path.join(target.path, name)));
+
+      case File() when name != '.packages' && name != 'pubspec.lock':
+        final File dest = File(path.join(target.path, name));
+        dest.writeAsBytesSync(entity.readAsBytesSync());
     }
   }
 }

diff --git a/docs/contributing/Tree-hygiene.md b/docs/contributing/Tree-hygiene.md
@@ -224,7 +224,7 @@ As a reviewer, you are the last line of defense.
 5. Is it testable? Is it tested? **All code must be tested.** Are there asserts? Encourage liberal use of assertions.
 6. Look for mistakes in indenting the code and other trivial formatting problems.
 7. Is new code licensed correctly?
-8. Is the documentation thorough and useful? Look for useless documentation, empty prose, and breadcrumbs. See the [documentation section](hStyle-guide-for-Flutter-repo.md#documentation-dartdocs-javadocs-etc) of our style guide for what that means.
+8. Is the documentation thorough and useful? Look for useless documentation, empty prose, and breadcrumbs. See the [documentation section](Style-guide-for-Flutter-repo.md#documentation-dartdocs-javadocs-etc) of our style guide for what that means.
 9. Check for good grammar in API docs and comments. Check that identifiers are named according to our conventions.
 
 Once you are satisfied with the contribution, and _only_ once you are satisfied,

diff --git a/docs/releases/archive/Release-Notes---Changes-in-1.2.1.md b/docs/releases/archive/Release-Notes---Changes-in-1.2.1.md
@@ -476,7 +476,7 @@ The following issues were addressed in 426 commits.
 | [flutter/plugins#765](https://github.com/flutter/plugins/pull/765) | Timestamps firestore |
 | [flutter/plugins#407](https://github.com/flutter/plugins/pull/407) | Fix url_launcher for iOS <10 |
 | [flutter/plugins#759](https://github.com/flutter/plugins/pull/759) | Correct usage of StreamBuilder |
-| [flutter/plugins#857](https://github.com/flutter/plugins/pull/857) | Use exoplayer's prefered API for MediaSources |
+| [flutter/plugins#857](https://github.com/flutter/plugins/pull/857) | Use exoplayer's preferred API for MediaSources |
 | [flutter/plugins#813](https://github.com/flutter/plugins/pull/813) | video_player: Fixed null exception when file has no width or height. |
 | [flutter/plugins#853](https://github.com/flutter/plugins/pull/853) | Change android invites dependency to dynamic links |
 | [flutter/plugins#408](https://github.com/flutter/plugins/pull/408) | Fix new formatting errors |

diff --git a/examples/api/lib/material/carousel/carousel.0.dart b/examples/api/lib/material/carousel/carousel.0.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 
-/// Flutter code sample for [Carousel].
+/// Flutter code sample for [CarouselView].
 
 void main() => runApp(const CarouselExampleApp());
 

diff --git a/examples/api/lib/material/choice_chip/choice_chip.0.dart b/examples/api/lib/material/choice_chip/choice_chip.0.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 
-/// Flutter code sample for [ActionChoice].
+/// Flutter code sample for [ChoiceChip].
 
 void main() => runApp(const ChipApp());
 

diff --git a/examples/api/lib/widgets/animated_grid/animated_grid.0.dart b/examples/api/lib/widgets/animated_grid/animated_grid.0.dart
@@ -138,7 +138,7 @@ typedef RemovedItemBuilder<T> = Widget Function(T item, BuildContext context, An
 /// This class only exposes as much of the Dart List API as is needed by the
 /// sample app. More list methods are easily added, however methods that
 /// mutate the list must make the same changes to the animated list in terms
-/// of [AnimatedGridState.insertItem] and [AnimatedGrid.removeItem].
+/// of [AnimatedGridState.insertItem] and [AnimatedGridState.removeItem].
 class ListModel<E> {
   ListModel({
     required this.listKey,

diff --git a/examples/api/lib/widgets/animated_list/animated_list.0.dart b/examples/api/lib/widgets/animated_list/animated_list.0.dart
@@ -122,7 +122,7 @@ typedef RemovedItemBuilder<T> = Widget Function(T item, BuildContext context, An
 /// This class only exposes as much of the Dart List API as is needed by the
 /// sample app. More list methods are easily added, however methods that
 /// mutate the list must make the same changes to the animated list in terms
-/// of [AnimatedListState.insertItem] and [AnimatedList.removeItem].
+/// of [AnimatedListState.insertItem] and [AnimatedListState.removeItem].
 class ListModel<E> {
   ListModel({
     required this.listKey,

diff --git a/examples/api/lib/widgets/binding/widget_binding_observer.0.dart b/examples/api/lib/widgets/binding/widget_binding_observer.0.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 
-/// Flutter code sample for [WidgetBindingsObserver].
+/// Flutter code sample for [WidgetsBindingObserver].
 
 void main() => runApp(const WidgetBindingObserverExampleApp());
 

diff --git a/examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart b/examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart
@@ -6,7 +6,7 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 
-/// Flutter code sample for [EditableText.onContentInserted].
+/// Flutter code sample for [EditableText.contentInsertionConfiguration].
 
 void main() => runApp(const KeyboardInsertedContentApp());
 

diff --git a/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart b/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart
@@ -49,7 +49,7 @@ class _ScrollEndNotificationExampleState extends State<ScrollEndNotificationExam
   }
 
   // After an interactive scroll "ends", auto-scroll so that last item in the
-  // viewport is completely visible. To accomodate mouse-wheel scrolls, other small
+  // viewport is completely visible. To accommodate mouse-wheel scrolls, other small
   // adjustments, and scrolling to the top, scrolls that put the scroll offset at
   // zero or change the scroll offset by less than itemExtent don't trigger
   // an auto-scroll. This also prevents the auto-scroll from triggering itself,