[flutter_releases] Flutter 1.22.1 Framework Cherrypicks (flutter#67552)

* [Docs] [Material] Fix Icons api docs (flutter#66508)

* [Docs] [Icons] Updating dart doc styles to recognize more styles of icons. All the 4 icon styles we support have to be pulled from 4 individual web fonts when we show the html page for api docs.

* Better documentation and that special awful case.

* Couple more places to remove.

* Add back the autovalidate class property (flutter#66267)

* Add back autovalidate property

* Add autovalidate property back (include tests)

* Fix typos

* One more test :)

* [flutter_tools] prevent running analyze-size with split-debug-info (flutter#66983)

Running a build command with split debug info and analyze size causes a crash in the snapshot analysis library. Disable the combination of these two flags.

Fixes flutter#66962

* fix invocatiion of non-existent function after cherry pick

* update engine revision

Co-authored-by: Will Larche <larche@google.com>
Co-authored-by: Pedro Massango <pedromassango.developer@gmail.com>
Co-authored-by: Jonah Williams <jonahwilliams@google.com>

Author: 4 people

bin/internal/engine.version

@@ -1 +1 @@
-5babba6c4d25fa237bbf755ab85c9a0c50b3c6ec
+75bef9f6c8ac2ed4e1e04cdfcd88b177d9f1850d

dev/docs/assets/overrides.css

@@ -121,8 +121,7 @@ dl.dl-horizontal dt {
 }
 
 /* Line the material icons up with their labels */
-i.material-icons.md-36,
-i.material-icons.md-48 {
+i.md-36 {
   vertical-align: bottom;
 }
 

dev/docs/styles.html

@@ -1,25 +1,13 @@
 <!-- style overrides for dartdoc -->
 <style>
 @import 'https://fonts.googleapis.com/css?family=Roboto:500,400italic,300,400,100i';
-@import 'https://fonts.googleapis.com/css?family=Material+Icons';
+@import 'https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Sharp|Material+Icons+Round';
 </style>
 
 <link href="../assets/overrides.css" rel="stylesheet" type="text/css">
 
-<!-- The following rules are from http://google.github.io/material-design-icons/ -->
-<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Sharp|Material+Icons+Round" rel="stylesheet">
 <style>
-  /* Rules for sizing the icon. */
-  .material-icons.md-18 { font-size: 18px; }
-  .material-icons.md-24 { font-size: 24px; }
-  .material-icons.md-36 { font-size: 36px; }
-  .material-icons.md-48 { font-size: 48px; }
-
-  /* Rules for using icons as black on a light background. */
-  .material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
-  .material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
-
-  /* Rules for using icons as white on a dark background. */
-  .material-icons.md-light { color: rgba(255, 255, 255, 1); }
-  .material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
+  /* Rule for sizing the icon. */
+  .md-36 { font-size: 36px; }
 </style>

dev/tools/update_icons.dart

@@ -263,14 +263,40 @@ void _testIsMapSuperset(Map<String, String> newCodepoints, Map<String, String> o
 }
 
 String _generateDeclaration(MapEntry<String, String> tokenPair) {
-  final String identifier = _generateIdentifier(tokenPair.key);
   final String description = tokenPair.key.replaceAll('_', ' ');
+
+  String styleSuffix = '';
+  String webFontKey = tokenPair.key;
+
+  // The first line of each generated declaration includes a comment of html.
+  // DartDocs reads that to make the listings in our api docs that shows the
+  // icon rendered next to its key name. Unfortunately, unlike Flutter, this
+  // html needs to use a different web font for each style. We read the style's
+  // suffix from the key for Flutter's icons font, add the corresponding style's
+  // suffix to the class we pass into html, and then remove the suffix from the
+  // icon key. The keys needed for the individual web fonts do not use a suffix
+  // to denote style.
+  if (webFontKey.endsWith('_outlined') && webFontKey!='insert_chart_outlined') {
+    styleSuffix = '-outlined';
+    webFontKey = webFontKey.replaceAll('_outlined', '');
+  }
+  if (webFontKey.endsWith('_rounded')) {
+    styleSuffix = '-round';
+    webFontKey = webFontKey.replaceAll('_rounded', '');
+  }
+  if (webFontKey.endsWith('_sharp')) {
+    styleSuffix = '-sharp';
+    webFontKey = webFontKey.replaceAll('_sharp', '');
+  }
+
+  final String identifier = _generateIdentifier(tokenPair.key);
   final String rtl = _mirroredIcons.contains(tokenPair.key)
       ? ', matchTextDirection: true'
       : '';
+
   return '''
 
-  /// <i class="material-icons md-36">${tokenPair.key}</i> &#x2014; material icon named "$description".
+  /// <i class="material-icons$styleSuffix md-36">$webFontKey</i> &#x2014; material icon named "$description".
   static const IconData $identifier = IconData(0x${tokenPair.value}, fontFamily: 'MaterialIcons'$rtl);
 ''';
 }

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

@@ -79,11 +79,11 @@ class Form extends StatefulWidget {
     Key key,
     @required this.child,
     @Deprecated(
-      'Use autoValidateMode parameter which provide more specific '
-      'behaviour related to auto validation. '
+      'Use autoValidateMode parameter which provides more specific '
+      'behavior related to auto validation. '
       'This feature was deprecated after v1.19.0.'
     )
-    bool autovalidate = false,
+    this.autovalidate = false,
     this.onWillPop,
     this.onChanged,
     AutovalidateMode autovalidateMode,
@@ -94,9 +94,8 @@ class Form extends StatefulWidget {
          autovalidate == true && autovalidateMode == null,
          'autovalidate and autovalidateMode should not be used together.'
        ),
-       autovalidateMode = autovalidate
-           ? AutovalidateMode.always
-           : (autovalidateMode ?? AutovalidateMode.disabled),
+       autovalidateMode = autovalidateMode ??
+         (autovalidate ? AutovalidateMode.always : AutovalidateMode.disabled),
        super(key: key);
 
   /// Returns the closest [FormState] which encloses the given context.
@@ -143,6 +142,15 @@ class Form extends StatefulWidget {
   /// {@macro flutter.widgets.form.autovalidateMode}
   final AutovalidateMode autovalidateMode;
 
+  /// Used to enable/disable form fields auto validation and update their error
+  /// text.
+  @Deprecated(
+    'Use autoValidateMode parameter which provides more specific '
+    'behavior related to auto validation. '
+    'This feature was deprecated after v1.19.0.'
+  )
+  final bool autovalidate;
+
   @override
   FormState createState() => FormState();
 }
@@ -320,11 +328,11 @@ class FormField<T> extends StatefulWidget {
     this.validator,
     this.initialValue,
     @Deprecated(
-      'Use autoValidateMode parameter which provide more specific '
-      'behaviour related to auto validation. '
+      'Use autoValidateMode parameter which provides more specific '
+      'behavior related to auto validation. '
       'This feature was deprecated after v1.19.0.'
     )
-    bool autovalidate = false,
+    this.autovalidate = false,
     this.enabled = true,
     AutovalidateMode autovalidateMode,
   }) : assert(builder != null),
@@ -333,9 +341,8 @@ class FormField<T> extends StatefulWidget {
          autovalidate == true && autovalidateMode == null,
          'autovalidate and autovalidateMode should not be used together.'
        ),
-       autovalidateMode = autovalidate
-           ? AutovalidateMode.always
-           : (autovalidateMode ?? AutovalidateMode.disabled),
+        autovalidateMode = autovalidateMode ??
+          (autovalidate ? AutovalidateMode.always : AutovalidateMode.disabled),
        super(key: key);
 
   /// An optional method to call with the final value when the form is saved via
@@ -387,6 +394,15 @@ class FormField<T> extends StatefulWidget {
   /// {@endtemplate}
   final AutovalidateMode autovalidateMode;
 
+  /// Used to enable/disable auto validation and update their error
+  /// text.
+  @Deprecated(
+    'Use autoValidateMode parameter which provides more specific '
+    'behavior related to auto validation. '
+    'This feature was deprecated after v1.19.0.'
+  )
+  final bool autovalidate;
+
   @override
   FormFieldState<T> createState() => FormFieldState<T>();
 }

packages/flutter/lib/src/widgets/form.dart

@@ -886,4 +886,87 @@ void main() {
     expect(fieldValue, '123456');
     expect(formKey.currentState.validate(), isFalse);
   });
+
+  testWidgets('FormField.autovalidate parameter is passed into class the property', (WidgetTester tester) async {
+    String errorText(String value) => '$value/error';
+    const ObjectKey widgetKey = ObjectKey('key');
+
+    Widget builder({@required bool autovalidate}) {
+      return MaterialApp(
+        home: MediaQuery(
+          data: const MediaQueryData(devicePixelRatio: 1.0),
+          child: Directionality(
+            textDirection: TextDirection.ltr,
+            child: Center(
+              child: Material(
+                child: FormField<String>(
+                  key: widgetKey,
+                  initialValue: 'foo',
+                  autovalidate: autovalidate,
+                  builder: (FormFieldState<String> state) {
+                    return Container();
+                  },
+                  validator: errorText,
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    // When autovalidate is true
+    await tester.pumpWidget(builder(autovalidate: true));
+
+    final Finder formFieldFinder = find.byKey(widgetKey);
+    FormField<String> formField = tester.widget(formFieldFinder);
+    expect(formField.autovalidate, isTrue);
+    expect(formField.autovalidateMode, equals(AutovalidateMode.always));
+
+    // When autovalidate is false
+    await tester.pumpWidget(builder(autovalidate: false));
+
+    formField = tester.widget(formFieldFinder);
+    expect(formField.autovalidate, isFalse);
+    expect(formField.autovalidateMode, equals(AutovalidateMode.disabled));
+  });
+
+  testWidgets('Form.autovalidate parameter is passed into class the property', (WidgetTester tester) async {
+    const ObjectKey widgetKey = ObjectKey('key');
+
+    Widget builder({@required bool autovalidate}) {
+      return MaterialApp(
+        home: MediaQuery(
+          data: const MediaQueryData(devicePixelRatio: 1.0),
+          child: Directionality(
+            textDirection: TextDirection.ltr,
+            child: Center(
+              child: Material(
+                child: Form(
+                  key: widgetKey,
+                  autovalidate: autovalidate,
+                  child: Container(),
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    // When autovalidate is true
+    await tester.pumpWidget(builder(autovalidate: true));
+
+    final Finder formFinder = find.byKey(widgetKey);
+    Form formWidget = tester.widget(formFinder);
+    expect(formWidget.autovalidate, isTrue);
+    expect(formWidget.autovalidateMode, equals(AutovalidateMode.always));
+
+    // When autovalidate is false
+    await tester.pumpWidget(builder(autovalidate: false));
+
+    formWidget = tester.widget(formFinder);
+    expect(formWidget.autovalidate, isFalse);
+    expect(formWidget.autovalidateMode, equals(AutovalidateMode.disabled));
+  });
 }

packages/flutter/test/widgets/form_test.dart

@@ -458,7 +458,8 @@ abstract class FlutterCommand extends Command<void> {
         'symbol files can be stored for later use. These symbol files contain '
         'the information needed to symbolize Dart stack traces. For an app built '
         "with this flag, the 'flutter symbolize' command with the right program "
-        'symbol file is required to obtain a human readable stack trace.',
+        'symbol file is required to obtain a human readable stack trace.\n'
+        'This flag cannot be combined with --analyze-size',
       valueHelp: '/project-name/v1.2.3/',
     );
   }
@@ -654,7 +655,8 @@ abstract class FlutterCommand extends Command<void> {
       help: 'Whether to produce additional profile information for artifact output size. '
         'This flag is only supported on release builds. When building for Android, a single '
         'ABI must be specified at a time with the --target-platform flag. When building for iOS, '
-        'only the symbols from the arm64 architecture are used to analyze code size.'
+        'only the symbols from the arm64 architecture are used to analyze code size.\n'
+        'This flag cannot be combined with --split-debug-info.'
     );
   }
 
@@ -737,6 +739,9 @@ abstract class FlutterCommand extends Command<void> {
     if (buildMode != BuildMode.release && codeSizeDirectory != null) {
       throwToolExit('--analyze-size can only be used on release builds.');
     }
+    if (codeSizeDirectory != null && splitDebugInfoPath != null) {
+      throwToolExit('--analyze-size cannot be combined with --split-debug-info.');
+    }
 
     final bool treeShakeIcons = argParser.options.containsKey('tree-shake-icons')
       && buildMode.isPrecompiled

packages/flutter_tools/lib/src/runner/flutter_command.dart

@@ -78,4 +78,27 @@ void main() {
 
     expect(result.exitCode, 1);
   });
+
+  testWithoutContext('--analyze-size is not supported in combination with --split-debug-info', () async {
+    final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
+    final List<String> localEngineArguments = <String>[
+      if (platform.environment.containsKey('FLUTTER_LOCAL_ENGINE'))
+        '--local-engine=${platform.environment['FLUTTER_LOCAL_ENGINE']}',
+      if (platform.environment.containsKey('FLUTTER_LOCAL_ENGINE_SRC_PATH'))
+        '--local-engine-src-path=${platform.environment['FLUTTER_LOCAL_ENGINE_SRC_PATH']}',
+    ];
+    final ProcessResult result = await processManager.run(<String>[
+      flutterBin,
+       ...localEngineArguments,
+      'build',
+      'apk',
+      '--analyze-size',
+      '--target-platform=android-arm64',
+      '--split-debug-info=infos'
+    ], workingDirectory: fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'));
+
+    expect(result.stderr.toString(), contains('--analyze-size cannot be combined with --split-debug-info'));
+
+    expect(result.exitCode, 1);
+  });
 }