Merge remote-tracking branch 'upstream/master' into live_preview_came…

…ra_plugin

# Conflicts:
#	packages/firebase_ml_vision/example/lib/main.dart
#	packages/firebase_ml_vision/lib/src/firebase_vision.dart

packages/firebase_ml_vision/example/lib/main.dart

@@ -177,19 +177,19 @@ class _MyHomePageState extends State<_MyHomePage>
             itemBuilder: (BuildContext context) =>
                 <PopupMenuEntry<FirebaseVisionDetectorType>>[
                   const PopupMenuItem<FirebaseVisionDetectorType>(
-                    child: const Text('Detect Barcode'),
+                    child: Text('Detect Barcode'),
                     value: FirebaseVisionDetectorType.barcode,
                   ),
                   const PopupMenuItem<FirebaseVisionDetectorType>(
-                    child: const Text('Detect Face'),
+                    child: Text('Detect Face'),
                     value: FirebaseVisionDetectorType.face,
                   ),
                   const PopupMenuItem<FirebaseVisionDetectorType>(
-                    child: const Text('Detect Label'),
+                    child: Text('Detect Label'),
                     value: FirebaseVisionDetectorType.label,
                   ),
                   const PopupMenuItem<FirebaseVisionDetectorType>(
-                    child: const Text('Detect Text'),
+                    child: Text('Detect Text'),
                     value: FirebaseVisionDetectorType.text,
                   ),
                 ],
@@ -211,7 +211,7 @@ class _MyHomePageState extends State<_MyHomePage>
         controller: _tabController,
         children: <Widget>[
           _imageFile == null
-              ? const Center(child: const Text('No image selected.'))
+              ? const Center(child: Text('No image selected.'))
               : _buildImage(),
           LivePreview(_currentDetector),
         ],

packages/firebase_ml_vision/lib/src/firebase_vision.dart

@@ -29,7 +29,7 @@ class FirebaseVision {
 
   @visibleForTesting
   static final MethodChannel channel =
-      const MethodChannel('plugins.flutter.io/firebase_ml_vision');
+      MethodChannel('plugins.flutter.io/firebase_ml_vision');
 
   /// Singleton of [FirebaseVision].
   ///