Merge remote-tracking branch 'upstream/main' into camx_vidres1

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,7 +1,11 @@
-## 0.5.0+13
+## 0.5.0+14
 
 * Wraps classes needed to implement resolution configuration for video recording.
 
+## 0.5.0+13
+
+* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters.
+
 ## 0.5.0+12
 
 * Wraps classes needed to implement resolution configuration for image capture, image analysis, and preview.

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.5.0+13
+version: 0.5.0+14
 
 environment:
   sdk: ">=2.19.0 <4.0.0"