Merge branch 'main' into maps-android-remove-legacy-tests

Author: stuartmorgan-g

.ci/flutter_stable.version

@@ -1 +1 @@
-6fba2447e95c451518584c35e25f5433f14d888c
+fcf2c11572af6f390246c056bc905eca609533a0

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.19
+
+* Changes target rotation of captured images to current default display rotation to fix captured
+  photo orientation to upright.
+
 ## 0.6.18+3
 
 * Fixes incorrect camera preview mirroring for front cameras of devices using the Impeller backend.

packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart

@@ -392,7 +392,8 @@ class AndroidCameraCameraX extends CameraPlatform {
     // Configure ImageCapture instance.
     imageCapture = proxy.newImageCapture(
       resolutionSelector: presetResolutionSelector,
-      /* use CameraX default target rotation */ targetRotation: null,
+      /* use CameraX default target rotation */ targetRotation:
+          await deviceOrientationManager.getDefaultDisplayRotation(),
     );
 
     // Configure ImageAnalysis instance.
@@ -966,9 +967,9 @@ class AndroidCameraCameraX extends CameraPlatform {
       await imageCapture!.setFlashMode(CameraXFlashMode.off);
     }
 
-    // Set target rotation to default CameraX rotation only if capture
-    // orientation not locked.
-    if (!captureOrientationLocked && shouldSetDefaultRotation) {
+    // Set target rotation to the current default CameraX rotation if
+    // the capture orientation is not locked.
+    if (!captureOrientationLocked) {
       await imageCapture!.setTargetRotation(
         await deviceOrientationManager.getDefaultDisplayRotation(),
       );

packages/camera/camera_android_camerax/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera_android_camerax
 description: Android implementation of the camera plugin using the CameraX library.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.6.18+3
+version: 0.6.19
 
 environment:
   sdk: ^3.7.0

packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart

@@ -3488,7 +3488,7 @@ void main() {
   );
 
   test(
-    'takePicture sets ImageCapture target rotation to currrent photo rotation when orientation unlocked',
+    'takePicture sets ImageCapture target rotation as expected when orientation locked or unlocked',
     () async {
       final AndroidCameraCameraX camera = AndroidCameraCameraX();
       final MockImageCapture mockImageCapture = MockImageCapture();
@@ -3531,7 +3531,7 @@ void main() {
       // Orientation is unlocked and plugin does not need to set default target
       // rotation manually.
       await camera.takePicture(cameraId);
-      verifyNever(mockImageCapture.setTargetRotation(any));
+      verify(mockImageCapture.setTargetRotation(defaultTargetRotation));
 
       // Orientation is locked and plugin does not need to set default target
       // rotation manually.

packages/in_app_purchase/in_app_purchase_android/example/integration_test/in_app_purchase_test.dart

@@ -106,6 +106,8 @@ void main() {
     testWidgets('BillingClient.queryPurchaseHistory',
         (WidgetTester tester) async {
       try {
+        // Intentional use of a deprecated method to make sure it still works.
+        // ignore: deprecated_member_use
         await billingClient.queryPurchaseHistory(ProductType.inapp);
       } on MissingPluginException {
         fail('Method channel is not setup correctly');

packages/video_player/video_player_platform_interface/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 6.4.0
 
+* Adds HTML5 video poster support as a VideoPlayerWebOptions.
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
 
 ## 6.3.0

packages/video_player/video_player_platform_interface/lib/video_player_platform_interface.dart

@@ -429,6 +429,7 @@ class VideoPlayerWebOptions {
     this.controls = const VideoPlayerWebOptionsControls.disabled(),
     this.allowContextMenu = true,
     this.allowRemotePlayback = true,
+    this.poster,
   });
 
   /// Additional settings for how control options are displayed
@@ -439,6 +440,9 @@ class VideoPlayerWebOptions {
 
   /// Whether remote playback is allowed
   final bool allowRemotePlayback;
+
+  /// The URL of the poster image to be displayed before the video starts
+  final Uri? poster;
 }
 
 /// [VideoPlayerWebOptions] can be used to set how control options are displayed

packages/video_player/video_player_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/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: 6.3.0
+version: 6.4.0
 
 environment:
   sdk: ^3.6.0

packages/video_player/video_player_platform_interface/test/video_player_web_options_test.dart

@@ -29,4 +29,24 @@ void main() {
       expect(options.allowRemotePlayback, isTrue);
     },
   );
+
+  group('VideoPlayerOptions poster', () {
+    test(
+      'defaults to null',
+      () {
+        const VideoPlayerWebOptions options = VideoPlayerWebOptions();
+        expect(options.poster, null);
+      },
+    );
+
+    test(
+      'with a value',
+      () {
+        final VideoPlayerWebOptions options = VideoPlayerWebOptions(
+          poster: Uri.parse('https://example.com/poster.jpg'),
+        );
+        expect(options.poster, Uri.parse('https://example.com/poster.jpg'));
+      },
+    );
+  });
 }