Merge pull request #2 from gspencergoog/master

Pulling to make workspace up to date wrt master.

Author: gspencergoog

.analysis_options

@@ -7,15 +7,19 @@
 # See the configuration guide for more
 # https://github.com/dart-lang/sdk/tree/master/pkg/analyzer#configuring-the-analyzer
 #
-# There are three similar analysis options files in the flutter repo:
+# There are four similar analysis options files in the flutter repos:
 #   - .analysis_options (this file)
 #   - .analysis_options_repo
 #   - packages/flutter/lib/analysis_options_user.yaml
+#   - https://github.com/flutter/plugins/blob/master/.analysis_options
 #
 # This file contains the analysis options used by Flutter editors, such as Atom.
 # It is very similar to the .analysis_options_repo file in this same directory;
 # the only difference (currently) is the public_member_api_docs option,
 # which triggers too many messages to be used in editors.
+#
+# The flutter/plugins repo contains a copy of this file, which should be kept
+# in sync with this file.
 
 analyzer:
   language:

VERSION

@@ -6,4 +6,4 @@
 # incompatible way, this version number might not change. Instead, the version
 # number for package:flutter will update to reflect that change.
 
-0.0.7-dev
+0.0.10-dev

bin/flutter

@@ -46,8 +46,8 @@ DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk"
 DART="$DART_SDK_PATH/bin/dart"
 PUB="$DART_SDK_PATH/bin/pub"
 
-# Test if running as superuser
-if [[ "$EUID" == "0" ]]; then
+# Test if running as superuser – but don't warn if running within Docker
+if [[ "$EUID" == "0" ]] && ! [[ -f /.dockerenv ]]; then
   echo "   Woah! You appear to be trying to run flutter as root."
   echo "   We strongly recommend running the flutter tool without superuser privileges."
   echo "  /"

bin/internal/README.md

@@ -0,0 +1,10 @@
+Dart SDK dependency
+===================
+
+The Dart SDK is downloaded from one of [the supported channels](https://www.dartlang.org/install/archive),
+cached in `bin/cache/dart-sdk` and is used to run Flutter Dart code.
+
+The file `bin/internal/dart-sdk.version` determines the version of Dart SDK
+that will be downloaded. Normally it points to the `dev` channel (for example,
+`1.24.0-dev.6.7`), but it can also point to particular bleeding edge build
+of Dart (for example, `hash/c0617d20158955d99d6447036237fe2639ba088c`).

bin/internal/dart-sdk.version

@@ -1 +1 @@
-1.24.0-dev.3.0
+1.24.0-dev.6.7

bin/internal/engine.version

@@ -1 +1 @@
-75c74dc463d56e17be10315cfde409010fd8f90b
+18fdfb86bb3876fcbb4e1d25e5b2aad0c5cd669f

bin/internal/update_dart_sdk.ps1

@@ -29,7 +29,7 @@ if ((Test-Path $dartSdkStampPath) -and ($dartSdkVersion -eq (Get-Content $dartSd
 
 Write-Host "Downloading Dart SDK $dartSdkVersion..."
 $dartZipName = "dartsdk-windows-x64-release.zip"
-$dartChannel = if ($dartSdkVersion.Contains("-dev.")) {"dev"} else {"stable"}
+$dartChannel = if ($dartSdkVersion.Contains("-dev.")) {"dev"} else {if ($dartSdkVersion.Contains("hash/")) {"be"} else {"stable"}}
 $dartSdkUrl = "https://storage.googleapis.com/dart-archive/channels/$dartChannel/raw/$dartSdkVersion/sdk/$dartZipName"
 
 if (Test-Path $dartSdkPath) {

bin/internal/update_dart_sdk.sh

@@ -41,6 +41,9 @@ if [ ! -f "$DART_SDK_STAMP_PATH" ] || [ "$DART_SDK_VERSION" != `cat "$DART_SDK_S
   if [[ $DART_SDK_VERSION == *"-dev."* ]]
   then
     DART_CHANNEL="dev"
+  elif [[ $DART_SDK_VERSION == "hash/"* ]]
+  then
+    DART_CHANNEL="be"
   fi
 
   DART_SDK_URL="https://storage.googleapis.com/dart-archive/channels/$DART_CHANNEL/raw/$DART_SDK_VERSION/sdk/$DART_ZIP_NAME"

dev/benchmarks/complex_layout/android/app/build.gradle

@@ -33,6 +33,14 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    aaptOptions {
+        // TODO(goderbauer): remove when https://github.com/flutter/flutter/issues/8986 is resolved.
+        if(System.getenv("FLUTTER_CI_WIN")) {
+            println "AAPT cruncher disabled when running on CI, see https://github.com/flutter/flutter/issues/8986"
+            cruncherEnabled false
+        }
+    }
 }
 
 flutter {

dev/benchmarks/complex_layout/lib/main.dart

@@ -111,9 +111,9 @@ class ComplexLayoutState extends State<ComplexLayout> {
               key: const Key('complex-scroll'), // this key is used by the driver test
               itemBuilder: (BuildContext context, int index) {
                 if (index % 2 == 0)
-                  return new FancyImageItem(index, key: new ValueKey<int>(index));
+                  return new FancyImageItem(index, key: new PageStorageKey<int>(index));
                 else
-                  return new FancyGalleryItem(index, key: new ValueKey<int>(index));
+                  return new FancyGalleryItem(index, key: new PageStorageKey<int>(index));
               },
             )
           ),
@@ -496,7 +496,7 @@ class ItemGalleryBox extends StatelessWidget {
               child: new TabBarView(
                 children: tabNames.map((String tabName) {
                   return new Container(
-                    key: new Key(tabName),
+                    key: new PageStorageKey<String>(tabName),
                     child: new Padding(
                       padding: const EdgeInsets.all(8.0),
                       child: new Card(
@@ -611,6 +611,7 @@ class GalleryDrawer extends StatelessWidget {
     final ScrollMode currentMode = ComplexLayoutApp.of(context).scrollMode;
     return new Drawer(
       child: new ListView(
+        key: const PageStorageKey<String>('gallery-drawer'),
         children: <Widget>[
           new FancyDrawerHeader(),
           new ListTile(