Merge branch 'master' into add_zoom_to_android_webview

* master:
  [webview_flutter] Add download listener to Android webview (flutter#4322)
  [video_player] add support for content-uri based videos (flutter#4330)
  [webview_flutter] Implementation of the webview_flutter_platform_interface package (flutter#4302)
  [camera] Bump minimum Flutter version and iOS deployment target (flutter#4327)
  [video_player] interface: add support for content-uri based videos (android only) (flutter#4307)
  Ignore unnecessary_import in legacy analysis options (flutter#4129)
  [ci] Enable the new Windows targets (flutter#4325)

# Conflicts:
#	packages/webview_flutter/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java
#	packages/webview_flutter/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewBuilder.java

Author: NickalasB

.ci.yaml

@@ -35,40 +35,11 @@ platform_properties:
       os: Windows
 
 targets:
-  # TODO(stuartmorgan) Remove once the renamed version below has propagated.
-  - name: Windows Plugins master channel
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: windows_build_and_platform_tests.yaml
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
-  # TODO(stuartmorgan) Remove once the renamed version below has propagated.
-  - name: Windows Plugins stable channel
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: windows_build_and_platform_tests.yaml
-      channel: stable
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
   - name: Windows win32-platform_tests master
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
       dependencies: >
         [
@@ -78,11 +49,9 @@ targets:
 
   - name: Windows win32-platform_tests stable
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
       channel: stable
       dependencies: >
@@ -93,11 +62,9 @@ targets:
 
   - name: Windows windows-build_all_plugins master
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
       dependencies: >
         [
@@ -107,11 +74,9 @@ targets:
 
   - name: Windows windows-build_all_plugins stable
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
       channel: stable
       dependencies: >
@@ -122,11 +87,9 @@ targets:
 
   - name: Windows uwp-platform_tests master
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: uwp_build_and_platform_tests.yaml
       dependencies: >
         [
@@ -136,11 +99,9 @@ targets:
 
   - name: Windows plugin_tools_tests
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: plugin_tools_tests.yaml
     scheduler: luci
 

analysis_options_legacy.yaml

@@ -7,6 +7,9 @@ analyzer:
     - '**/*.mocks.dart' # Mockito @GenerateMocks
   errors:
     always_require_non_null_named_parameters: false # not needed with nnbd
+    # TODO(https://github.com/flutter/flutter/issues/74381):
+    # Clean up existing unnecessary imports, and remove line to ignore.
+    unnecessary_import: ignore
     unnecessary_null_comparison: false # Turned as long as nnbd mix-mode is supported.
 linter:
   rules:

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.3
+
+* Update minimum Flutter SDK to 2.5 and iOS deployment target to 9.0.
+
 ## 0.9.2+2
 
 * Ensure that setting the exposure offset returns the new offset value on Android.

packages/camera/camera/README.md

@@ -6,7 +6,7 @@ A Flutter plugin for iOS and Android allowing access to the device cameras.
 
 *Note*: This plugin is still under development, and some APIs might not be available yet. We are working on a refactor which can be followed here: [issue](https://github.com/flutter/flutter/issues/31225)
 
-## Features:
+## Features
 
 * Display live camera preview in a widget.
 * Snapshots can be captured and saved to a file.
@@ -19,7 +19,9 @@ First, add `camera` as a [dependency in your pubspec.yaml file](https://flutter.
 
 ### iOS
 
-iOS 10.0 of higher is needed to use the camera plugin. If compiling for any version lower than 10.0 make sure to check the iOS version before using the camera plugin. For example, using the [device_info_plus](https://pub.dev/packages/device_info_plus) plugin.
+The camera plugin functionality works on iOS 10.0 or higher. If compiling for any version lower than 10.0,
+make sure to programmatically check the version of iOS running on the device before using any camera plugin features.
+The [device_info_plus](https://pub.dev/packages/device_info_plus) plugin, for example, can be used to check the iOS version.
 
 Add two rows to the `ios/Runner/Info.plist`:
 

packages/camera/camera/example/ios/Flutter/AppFrameworkInfo.plist

@@ -25,6 +25,6 @@
     <string>arm64</string>
   </array>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

@@ -504,7 +504,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -554,7 +554,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

packages/camera/camera/example/pubspec.yaml

@@ -3,8 +3,8 @@ description: Demonstrates how to use the camera plugin.
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
+  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
 
 dependencies:
   camera:

packages/camera/camera/ios/camera.podspec

@@ -17,6 +17,6 @@ A Flutter plugin to use the camera from your Flutter app.
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
 
-  s.platform = :ios, '8.0'
+  s.platform = :ios, '9.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
 end

packages/camera/camera/pubspec.yaml

@@ -4,11 +4,11 @@ description: A Flutter plugin for getting information about and controlling the
   and streaming image buffers to dart.
 repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.9.2+2
+version: 0.9.3
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
 
 flutter:
   plugin:

packages/video_player/video_player/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0
+
+* Add `contentUri` based VideoPlayerController.
+
 ## 2.1.15
 
 * Ensured seekTo isn't called before video player is initialized. Fixes [#89259](https://github.com/flutter/flutter/issues/89259).

packages/video_player/video_player/lib/video_player.dart

@@ -222,6 +222,21 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
         httpHeaders = const {},
         super(VideoPlayerValue(duration: Duration.zero));
 
+  /// Constructs a [VideoPlayerController] playing a video from a contentUri.
+  ///
+  /// This will load the video from the input content-URI.
+  /// This is supported on Android only.
+  VideoPlayerController.contentUri(Uri contentUri,
+      {this.closedCaptionFile, this.videoPlayerOptions})
+      : assert(defaultTargetPlatform == TargetPlatform.android,
+            'VideoPlayerController.contentUri is only supported on Android.'),
+        dataSource = contentUri.toString(),
+        dataSourceType = DataSourceType.contentUri,
+        package = null,
+        formatHint = null,
+        httpHeaders = const {},
+        super(VideoPlayerValue(duration: Duration.zero));
+
   /// The URI to the video file. This will be in different formats depending on
   /// the [DataSourceType] of the original video.
   final String dataSource;
@@ -298,6 +313,12 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
           uri: dataSource,
         );
         break;
+      case DataSourceType.contentUri:
+        dataSourceDescription = DataSource(
+          sourceType: DataSourceType.contentUri,
+          uri: dataSource,
+        );
+        break;
     }
 
     if (videoPlayerOptions?.mixWithOthers != null) {

packages/video_player/video_player/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android, iOS, and web.
 repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.1.15
+version: 2.2.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -24,7 +24,7 @@ dependencies:
   flutter:
     sdk: flutter
   meta: ^1.3.0
-  video_player_platform_interface: ^4.1.0
+  video_player_platform_interface: ^4.2.0
   # The design on https://flutter.dev/go/federated-plugins was to leave
   # this constraint as "any". We cannot do it right now as it fails pub publish
   # validation, so we set a ^ constraint. The exact value doesn't matter since

packages/video_player/video_player/test/video_player_test.dart

@@ -284,6 +284,15 @@ void main() {
       });
     });
 
+    test('contentUri', () async {
+      final VideoPlayerController controller =
+          VideoPlayerController.contentUri(Uri.parse('content://video'));
+      await controller.initialize();
+
+      expect(fakeVideoPlayerPlatform.dataSourceDescriptions[0].uri,
+          'content://video');
+    });
+
     test('dispose', () async {
       final VideoPlayerController controller = VideoPlayerController.network(
         'https://127.0.0.1',

packages/video_player/video_player_platform_interface/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.2.0
+
+* Add `contentUri` to `DataSourceType`.
+
 ## 4.1.0
 
 * Add `httpHeaders` to `DataSource`
@@ -29,7 +33,7 @@
 
 ## 2.1.0
 
-* Add VideoPlayerOptions with audo mix mode
+* Add VideoPlayerOptions with audio mix mode
 
 ## 2.0.2
 

packages/video_player/video_player_platform_interface/lib/method_channel_video_player.dart

@@ -42,6 +42,9 @@ class MethodChannelVideoPlayer extends VideoPlayerPlatform {
       case DataSourceType.file:
         message.uri = dataSource.uri;
         break;
+      case DataSourceType.contentUri:
+        message.uri = dataSource.uri;
+        break;
     }
 
     TextureMessage response = await _api.create(message);

packages/video_player/video_player_platform_interface/lib/video_player_platform_interface.dart

@@ -196,6 +196,9 @@ enum DataSourceType {
 
   /// The video was loaded off of the local filesystem.
   file,
+
+  /// The video is available via contentUri. Android only.
+  contentUri,
 }
 
 /// The file format of the given video.

packages/video_player/video_player_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/master/packages/video_player
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 4.1.0
+version: 4.2.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/video_player/video_player_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.4
+
+* Adopt `video_player_platform_interface` 4.2 and opt out of `contentUri` data source.
+  
 ## 2.0.3
 
 * Add `implements` to pubspec.

packages/video_player/video_player_web/example/integration_test/video_player_web_test.dart

@@ -68,6 +68,17 @@ void main() {
           throwsUnimplementedError);
     });
 
+    testWidgets('cannot create from content URI', (WidgetTester tester) async {
+      expect(
+          VideoPlayerPlatform.instance.create(
+            DataSource(
+              sourceType: DataSourceType.contentUri,
+              uri: 'content://video',
+            ),
+          ),
+          throwsUnimplementedError);
+    });
+
     testWidgets('can dispose', (WidgetTester tester) async {
       expect(VideoPlayerPlatform.instance.dispose(await textureId), completes);
     });

packages/video_player/video_player_web/lib/video_player_web.dart

@@ -88,6 +88,9 @@ class VideoPlayerPlugin extends VideoPlayerPlatform {
       case DataSourceType.file:
         return Future.error(UnimplementedError(
             'web implementation of video_player cannot play local files'));
+      case DataSourceType.contentUri:
+        return Future.error(UnimplementedError(
+            'web implementation of video_player cannot play content uri'));
     }
 
     final _VideoPlayer player = _VideoPlayer(

packages/video_player/video_player_web/pubspec.yaml

@@ -2,7 +2,7 @@ name: video_player_web
 description: Web platform implementation of video_player.
 repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.0.3
+version: 2.0.4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -22,7 +22,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   meta: ^1.3.0
-  video_player_platform_interface: ^4.0.0
+  video_player_platform_interface: ^4.2.0
 
 dev_dependencies:
   flutter_test:

packages/webview_flutter/webview_flutter/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 2.0.13
 
+* Send URL of File to download to the NavigationDelegate on Android just like it is already done on iOS.
 * Updated Android lint settings.
 * Enable native double-tap to zoom, and pinch to zoom functionality on Android