Merge branch 'master' into fix/fix_slider_text_null_error

* master:
  plugin_ffi template comment fix (flutter#148378)
  Roll Flutter Engine from 942d7c35de75 to 9e17588b330c (2 revisions) (flutter#148455)
  Reland fix TextField helper top padding on M3 (flutter#146754)
  Removing duplicate assert on `VisualDensity` constructor (flutter#148281)
  Roll Flutter Engine from 65ac4bf96ed7 to 942d7c35de75 (1 revision) (flutter#148450)
  Roll Flutter Engine from c11d64be5102 to 65ac4bf96ed7 (3 revisions) (flutter#148448)
  Roll Flutter Engine from f6195e9d4b4b to c11d64be5102 (1 revision) (flutter#148445)

Author: yinxu

bin/internal/engine.version

@@ -1 +1 @@
-f6195e9d4b4bed13e144c7b551bd11aaa38fc4fb
+9e17588b330ca997f9989cfb63137425e74609b8

packages/flutter/lib/src/material/input_decorator.dart

@@ -729,7 +729,9 @@ class _RenderDecoration extends RenderBox with SlottedContainerRenderObjectMixin
        _expands = expands,
        _material3 = material3;
 
-  static const double subtextGap = 8.0;
+  // TODO(bleroux): consider defining this value as a Material token and making it
+  // configurable by InputDecorationTheme.
+  double get subtextGap => material3 ? 4.0 : 8.0;
 
   RenderBox? get icon => childForSlot(_DecorationSlot.icon);
   RenderBox? get input => childForSlot(_DecorationSlot.input);

packages/flutter/lib/src/material/theme_data.dart

@@ -2328,7 +2328,6 @@ class VisualDensity with Diagnosticable {
     this.horizontal = 0.0,
     this.vertical = 0.0,
   }) : assert(vertical <= maximumDensity),
-       assert(vertical <= maximumDensity),
        assert(vertical >= minimumDensity),
        assert(horizontal <= maximumDensity),
        assert(horizontal >= minimumDensity);

packages/flutter/test/material/input_decorator_test.dart

@@ -4490,23 +4490,20 @@ void main() {
   });
 
   group('Material3 - InputDecoration helper/counter/error', () {
-    // Overall height for InputDecorator (filled or outlined) is 80dp on mobile:
+    // Overall height for InputDecorator (filled or outlined) is 76dp on mobile:
     //    8 - top padding
     //   12 - floating label (font size = 16 * 0.75, line height is forced to 1.0)
     //    4 - gap between label and input
     //   24 - input text (font size = 16, line height = 1.5)
     //    8 - bottom padding
-    //    8 - gap above supporting text
+    //    4 - gap above helper/error/counter
     //   16 - helper/counter (font size = 12, line height is 1.5)
     const double topPadding = 8.0;
     const double floatingLabelHeight = 12.0;
     const double labelInputGap = 4.0;
     const double inputHeight = 24.0;
     const double bottomPadding = 8.0;
-    // TODO(bleroux): make the InputDecorator implementation compliant with M3 spec by changing
-    // the helperGap to 4.0 instead of 8.0.
-    // See https://github.com/flutter/flutter/issues/144984.
-    const double helperGap = 8.0;
+    const double helperGap = 4.0;
     const double helperHeight = 16.0;
     const double containerHeight = topPadding + floatingLabelHeight + labelInputGap + inputHeight + bottomPadding; // 56.0
     const double fullHeight = containerHeight + helperGap + helperHeight; // 80.0 (should be 76.0 based on M3 spec)

packages/flutter_tools/templates/plugin_ffi/ios.tmpl/Classes/projectName.c.tmpl

@@ -1,3 +1,3 @@
 // Relative import to be able to reuse the C sources.
-// See the comment in ../{projectName}}.podspec for more information.
+// See the comment in ../{{projectName}}.podspec for more information.
 #include "../../src/{{projectName}}.c"

packages/flutter_tools/templates/plugin_ffi/macos.tmpl/Classes/projectName.c.tmpl

@@ -1,3 +1,3 @@
 // Relative import to be able to reuse the C sources.
-// See the comment in ../{projectName}}.podspec for more information.
+// See the comment in ../{{projectName}}.podspec for more information.
 #include "../../src/{{projectName}}.c"