Merge branch 'master' into fix/simulator_url_issue

* master: (76 commits)
  Roll engine to 4893b07 (flutter#20160)
  Add tiles_scroll_perf__timeline_summary to devicelab (flutter#20105)
  Support touch in AndroidViewController. (flutter#19907)
  reduce the number of runs on the analyze benchmakr (flutter#20155)
  Revert "Reduce noise on the memory benchmarks" (flutter#20158)
  Add pub cache, artifacts, pkgs to Cirrus cache (flutter#20080)
  Reduce noise on the memory benchmarks (flutter#19630)
  remove const (flutter#20151)
  Support customizing standard accessibility action hints on Android. (flutter#19665)
  Fix latent type error in Flutter manifest (flutter#20143)
  Run macOS builds only if analyze task passed (flutter#20119)
  Fix issues found running tests //mobile/flutter/tests/app:basic_runner_test_* during a google3 roll.
  Move async from member access to construction (flutter#20035)
  re-re-enable lint unnecessary_const (flutter#20103)
  Remove SHARD env that was overriding matrix (flutter#20134)
  Der Datumsauswahldialog spricht jetzt deutsch (flutter#20115)
  Roll engine to a76054f (1 commit)
  Roll engine to 04aa0d4 (1 commit)
  Roll engine to 6929326
  Roll engine to de5f535
  ...

Author: Matteo Crippa

.cirrus.yml

@@ -7,6 +7,15 @@ task:
     PATH: "$CIRRUS_WORKING_DIR/bin:$CIRRUS_WORKING_DIR/bin/cache/dart-sdk/bin:$PATH"
 
   git_fetch_script: git fetch origin
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
+  flutter_pkg_cache:
+    folder: bin/cache/pkg
+    fingerprint_script: echo $OS; cat bin/internal/engine.version
+  artifacts_cache:
+    folder: bin/cache/artifacts
+    fingerprint_script: echo $OS; cat bin/internal/engine.version
   setup_script: |
     echo "SDK directory is: $PWD"
     ./bin/flutter --version
@@ -46,65 +55,64 @@ task:
         memory: 8G
 
 task:
-  name: tests-windows
-  env:
-    SHARD: tests
-  windows_container:
-    image: cirrusci/windowsservercore:2016
-    os_version: 2016
-    cpu: 4
-  env:
-    CIRRUS_WORKING_DIR: "C:\\Windows\\Temp\\flutter sdk"
-  git_fetch_script: git fetch origin
-  setup_script:
-    - bin\flutter.bat config --no-analytics
-    - bin\flutter.bat update-packages
-    - git fetch origin master
-  test_all_script:
-    - bin\cache\dart-sdk\bin\dart.exe -c dev\bots\test.dart
-
-task:
-  name: tool_tests-windows
-  env:
-    SHARD: tool_tests
   windows_container:
     image: cirrusci/windowsservercore:2016
     os_version: 2016
     cpu: 4
   env:
     CIRRUS_WORKING_DIR: "C:\\Windows\\Temp\\flutter sdk"
   git_fetch_script: git fetch origin
+  pub_cache:
+    folder: $APPDATA\Pub\Cache
+    fingerprint_script:
+      - ps:  $Env:OS; Get-ChildItem -Path "$Env:CIRRUS_WORKING_DIR" pubspec.yaml -Recurse | Select-String -Pattern "PUBSPEC CHECKSUM" -SimpleMatch
+  flutter_pkg_cache:
+    folder: bin\cache\pkg
+    fingerprint_script: echo %OS% & type bin\internal\engine.version
+  artifacts_cache:
+    folder: bin\cache\artifacts
+    fingerprint_script: echo %OS% & type bin\internal\engine.version
   setup_script:
     - bin\flutter.bat config --no-analytics
     - bin\flutter.bat update-packages
     - git fetch origin master
   test_all_script:
     - bin\cache\dart-sdk\bin\dart.exe -c dev\bots\test.dart
+  matrix:
+    - name: tests-windows
+      env:
+        SHARD: tests
+    - name: tool_tests-windows
+      env:
+        SHARD: tool_tests
 
 task:
-  name: tests-macos
-  env:
-    SHARD: tests
+  depends_on:
+    - analyze
   osx_instance:
     image: high-sierra-xcode-9.4.1
-  git_fetch_script: git fetch origin
-  setup_script:
-    - bin/flutter config --no-analytics
-    - bin/flutter update-packages
-  test_all_script: |
-    ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
-    bin/cache/dart-sdk/bin/dart -c dev/bots/test.dart
-
-task:
-  name: tool_tests-macos
   env:
-    SHARD: tool_tests
-  osx_instance:
-    image: high-sierra-xcode-9.4.1
+    CIRRUS_WORKING_DIR: "/tmp/flutter sdk"
   git_fetch_script: git fetch origin
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
+  flutter_pkg_cache:
+    folder: bin/cache/pkg
+    fingerprint_script: echo $OS; cat bin/internal/engine.version
+  artifacts_cache:
+    folder: bin/cache/artifacts
+    fingerprint_script: echo $OS; cat bin/internal/engine.version
   setup_script:
     - bin/flutter config --no-analytics
     - bin/flutter update-packages
   test_all_script: |
     ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
     bin/cache/dart-sdk/bin/dart -c dev/bots/test.dart
+  matrix:
+    - name: tests-macos
+      env:
+        SHARD: tests
+    - name: tool_tests-macos
+      env:
+        SHARD: tool_tests

.coveralls.yml

@@ -27,8 +27,9 @@ analyzer:
   errors:
     # treat missing required parameters as a warning (not a hint)
     missing_required_param: warning
+    # TODO: https://github.com/flutter/flutter/issues/20114
     # treat missing returns as a warning (not a hint)
-    missing_return: warning
+    missing_return: ignore
     # allow having TODOs in the code
     todo: ignore
   exclude:

analysis_options.yaml

@@ -1 +1 @@
-6f7bdc9fabef810b14577deef5cf330029fd290e
+4893b0760df08cecd8ee97bdf03856c296a6df14

bin/internal/engine.version

@@ -43,8 +43,15 @@ if (Test-Path $dartSdkPath) {
 }
 New-Item $dartSdkPath -force -type directory | Out-Null
 $dartSdkZip = "$cachePath\$dartZipName"
-Import-Module BitsTransfer
-Start-BitsTransfer -Source $dartSdkUrl -Destination $dartSdkZip
+
+Try {
+    Import-Module BitsTransfer
+    Start-BitsTransfer -Source $dartSdkUrl -Destination $dartSdkZip
+}
+Catch {
+    Write-Host "Downloading the Dart SDK using the BITS service failed, retrying with WebRequest..."
+    Invoke-WebRequest -Uri $dartSdkUrl -OutFile $dartSdkZip
+}
 
 Write-Host "Unzipping Dart SDK..."
 If (Get-Command 7z -errorAction SilentlyContinue) {

bin/internal/update_dart_sdk.ps1

@@ -11,4 +11,4 @@ void main() {
   test('test smoke test -- this test SHOULD FAIL', () async {
     expect(false, isTrue);
   });
-}
+}

dev/automated_tests/test_smoke_test/fail_test.dart

@@ -11,4 +11,4 @@ void main() {
   test('test smoke test -- this test should pass', () async {
     expect(true, isTrue);
   });
-}
+}

dev/automated_tests/test_smoke_test/pass_test.dart

@@ -22,7 +22,7 @@ if [ -d "$FLUTTER_PUB_CACHE" ]; then
 fi
 
 # Install dartdoc.
-bin/cache/dart-sdk/bin/pub global activate dartdoc 0.20.1
+bin/cache/dart-sdk/bin/pub global activate dartdoc 0.20.2
 
 # This script generates a unified doc set, and creates
 # a custom index.html, placing everything into dev/docs/doc.

dev/bots/docs.sh

@@ -128,18 +128,18 @@ Future<Null> _checkForTrailingSpaces() async {
         ? Platform.environment['TEST_COMMIT_RANGE']
         : await _getCommitRange();
     final List<String> fileTypes = <String>[
-      '*.dart', '*.cxx', '*.cpp', '*.cc', '*.c', '*.C', '*.h', '*.java', '*.mm', '*.m', '.yml',
+      '*.dart', '*.cxx', '*.cpp', '*.cc', '*.c', '*.C', '*.h', '*.java', '*.mm', '*.m', '*.yml',
     ];
     final EvalResult changedFilesResult = await _evalCommand(
       'git', <String>['diff', '-U0', '--no-color', '--name-only', commitRange, '--'] + fileTypes,
       workingDirectory: flutterRoot,
     );
     if (changedFilesResult.stdout == null) {
-      print('No Results for whitespace check.');
+      print('No files found that need to be checked for trailing whitespace.');
       return;
     }
     // Only include files that actually exist, so that we don't try and grep for
-    // nonexistent files (can occur when files are deleted or moved).
+    // nonexistent files, which can occur when files are deleted or moved.
     final List<String> changedFiles = changedFilesResult.stdout.split('\n').where((String filename) {
       return new File(filename).existsSync();
     }).toList();
@@ -148,7 +148,7 @@ Future<Null> _checkForTrailingSpaces() async {
         <String>[
           '--line-number',
           '--extended-regexp',
-          r'[[:space:]]+$',
+          r'[[:blank:]]$',
         ] + changedFiles,
         workingDirectory: flutterRoot,
         failureMessage: '${red}Whitespace detected at the end of source code lines.$reset\nPlease remove:',

dev/bots/test.dart

@@ -106,6 +106,18 @@ You must set the `ANDROID_HOME` environment variable to run tests on Android. If
 you have a local build of the Flutter engine, then you have a copy of the
 Android SDK at `.../engine/src/third_party/android_tools/sdk`.
 
+You can find where your Android SDK is using `flutter doctor`.
+
+## Running all tests
+
+To run all tests defined in `manifest.yaml`, use option `-a` (`--all`):
+
+```sh
+dart bin/run.dart -a
+```
+
+## Running specific tests
+
 To run a test, use option `-t` (`--task`):
 
 ```sh
@@ -127,20 +139,15 @@ To run multiple tests, repeat option `-t` (`--task`) multiple times:
 dart bin/run.dart -t test1 -t test2 -t test3
 ```
 
-To run all tests defined in `manifest.yaml`, use option `-a` (`--all`):
+To run tests from a specific stage, use option `-s` (`--stage`).
+Currently there are only three stages defined, `devicelab`,
+`devicelab_ios` and `devicelab_win`.
 
-```sh
-dart bin/run.dart -a
-```
-
-To run tests from a specific stage, use option `-s` (`--stage`):
 
 ```sh
 dart bin/run.dart -s {NAME_OF_STAGE}
 ```
 
-Currently there are only three stages defined, `devicelab`, `devicelab_ios` and `devicelab_win`.
-
 # Reproducing broken builds locally
 
 To reproduce the breakage locally `git checkout` the corresponding Flutter

dev/devicelab/README.md

@@ -85,7 +85,7 @@ void main() {
       final Future<String> restartStartingText =
         stdout.stream.firstWhere((String line) => line.endsWith('hot restart...'));
       final Future<String> restartEndingText =
-        stdout.stream.firstWhere((String line) => line.contains('Restart performed in '));
+        stdout.stream.firstWhere((String line) => line.contains('Hot restart performed in '));
       print('test: pressing "R" to perform a full reload...');
       run.stdin.write('R');
       await restartStartingText;

dev/devicelab/bin/tasks/commands_test.dart

@@ -31,14 +31,13 @@ Future<void> testReload(Process process, { Future<void> Function() onListening }
       .listen((String line) {
     print('attach:stdout: $line');
     stdout.add(line);
-    if (line.contains('Waiting') && onListening != null) {
+    if (line.contains('Waiting') && onListening != null)
       listening.complete(onListening());
-    }
     if (line.contains('To quit, press "q".'))
       ready.complete();
     if (line.contains('Reloaded '))
       reloaded.complete();
-    if (line.contains('Restarted app in '))
+    if (line.contains('Restarted application in '))
       restarted.complete();
     if (line.contains('Application finished'))
       finished.complete();
@@ -91,7 +90,7 @@ void main() {
     await device.unlock();
     final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui'));
     await inDirectory(appDir, () async {
-      section('Build: starting...');
+      section('Building');
       final String buildStdout = await eval(
           path.join(flutterDirectory.path, 'bin', 'flutter'),
           <String>['--suppress-analytics', 'build', 'apk', '--debug', 'lib/main.dart'],
@@ -105,15 +104,14 @@ void main() {
       await device.adb(<String>['install', '-r', apkPath]);
 
       try {
-        section('Launching attach.');
+        section('Launching `flutter attach`');
         Process attachProcess = await startProcess(
           path.join(flutterDirectory.path, 'bin', 'flutter'),
           <String>['--suppress-analytics', 'attach', '-d', device.deviceId],
           isBot: false, // we just want to test the output, not have any debugging info
         );
 
         await testReload(attachProcess, onListening: () async {
-          section('Launching app.');
           await device.shellExec('am', <String>['start', '-n', kActivityId]);
         });
 
@@ -124,15 +122,16 @@ void main() {
 
         final String currentTime = (await device.shellEval('date', <String>['"+%F %R:%S.000"'])).trim();
         print('Start time on device: $currentTime');
-        section('Launching app');
+        section('Relaunching application');
         await device.shellExec('am', <String>['start', '-n', kActivityId]);
 
+        // If the next line fails, your device may not support regexp search.
         final String observatoryLine = await device.adb(<String>['logcat', '-e', 'Observatory listening on http:', '-m', '1', '-T', currentTime]);
         print('Found observatory line: $observatoryLine');
         final String observatoryPort = new RegExp(r'Observatory listening on http://.*:([0-9]+)').firstMatch(observatoryLine)[1];
         print('Extracted observatory port: $observatoryPort');
 
-        section('Launching attach with given port.');
+        section('Launching attach with given port');
         attachProcess = await startProcess(
           path.join(flutterDirectory.path, 'bin', 'flutter'),
           <String>['--suppress-analytics', 'attach', '--debug-port', observatoryPort, '-d', device.deviceId],

dev/devicelab/bin/tasks/flutter_attach_test.dart

@@ -58,6 +58,8 @@ void main() {
         stdout.removeAt(0);
       if (stdout.first == 'Initializing gradle...')
         stdout.removeAt(0);
+      if (stdout.first == 'Resolving dependencies...')
+        stdout.removeAt(0);
       if (!(stdout.first.startsWith('Launching lib/main.dart on ') && stdout.first.endsWith(' in release mode...')))
         throw 'flutter run --release had unexpected first line: ${stdout.first}';
       stdout.removeAt(0);

dev/devicelab/bin/tasks/run_release_test.dart

@@ -0,0 +1,15 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_devicelab/tasks/perf_tests.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+
+Future<Null> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.android;
+  await task(createTilesScrollPerfTest());
+}
+

dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart

@@ -4,6 +4,7 @@
 
 import 'dart:async';
 import 'dart:io';
+import 'dart:math' as math;
 
 import 'package:path/path.dart' as path;
 
@@ -90,13 +91,13 @@ class _MegaGalleryBenchmark {
 
 /// Runs a [benchmark] several times and reports the average result.
 Future<double> _run(_Benchmark benchmark) async {
-  double total = 0.0;
+  double best;
   for (int i = 0; i < _kRunsPerBenchmark; i++) {
     // Delete cached analysis results.
     rmTree(dir('${Platform.environment['HOME']}/.dartServer'));
 
-    total += await benchmark();
+    final double result = await benchmark();
+    best = math.min(result, best ?? result);
   }
-  final double average = total / _kRunsPerBenchmark;
-  return average;
+  return best;
 }

dev/devicelab/lib/tasks/analysis.dart

@@ -22,6 +22,14 @@ TaskFunction createComplexLayoutScrollPerfTest() {
   ).run;
 }
 
+TaskFunction createTilesScrollPerfTest() {
+  return new PerfTest(
+    '${flutterDirectory.path}/dev/benchmarks/complex_layout',
+    'test_driver/scroll_perf.dart',
+    'tiles_scroll_perf',
+  ).run;
+}
+
 TaskFunction createComplexLayoutScrollMemoryTest() {
   return new MemoryTest(
     '${flutterDirectory.path}/dev/benchmarks/complex_layout',