reidbaker · reidbaker · Feb 20, 2024 · Feb 20, 2024 · Feb 20, 2024 · Feb 20, 2024
diff --git a/.ci.yaml b/.ci.yaml
@@ -1472,6 +1472,7 @@ targets:
 
   - name: Windows_arm64 windows-build_all_packages master
     recipe: packages/packages
+    presubmit: false
     timeout: 30
     bringup: true # https://github.com/flutter/flutter/issues/134083
     properties:
@@ -1506,6 +1507,7 @@ targets:
 
   - name: Windows_arm64 windows-build_all_packages stable
     recipe: packages/packages
+    presubmit: false
     timeout: 30
     bringup: true
     properties:

diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-064c340baf0e23790374f5b34ea067c2478e7fd1
+d12ba5c270d83c63cd3c1e89c1cd1f279bbb5696
diff --git a/.ci/flutter_stable.version b/.ci/flutter_stable.version
@@ -1 +1 @@
-bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+300451adae589accbece3490f4396f10bdf15e6e
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -395,6 +395,34 @@ updates:
       - dependency-name: "*"
         update-types: ["version-update:semver-minor", "version-update:semver-patch"]
 
+  - package-ecosystem: "gradle"
+    directory: "/packages/interactive_media_ads/android"
+    commit-message:
+      prefix: "[interactive_media_ads]"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "com.android.tools.build:gradle"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "junit:junit"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "org.mockito:*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "androidx.test:*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+
+  - package-ecosystem: "gradle"
+    directory: "/packages/interactive_media_ads/example/android/app"
+    commit-message:
+      prefix: "[interactive_media_ads]"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+
   - package-ecosystem: "gradle"
     directory: "/packages/image_picker/image_picker/example/android/app"
     commit-message:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,13 +36,20 @@ jobs:
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools
       run: dart pub get
       working-directory: ${{ github.workspace }}/script/tool
 
+    # Give some time for LUCI checks to start becoming populated.
+    # Because of latency in Github Webhooks, we need to wait for a while
+    # before being able to look at checks scheduled by LUCI.
+    - name: Give webhooks a minute
+      run: sleep 60s
+      shell: bash
+
     # The next step waits for all tests, but when there are issues with the
     # hooks it can take a long time for the tests to even be registered. If
     # "Wait on all tests" runs before that happens, it will pass immediately

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v2.4.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v2.4.0
         with:
           persist-credentials: false
 
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v1.0.26
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v1.0.26
         with:
           sarif_file: results.sarif
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -23,6 +23,7 @@ packages/google_identity_services_web/**                 @ditman
 packages/google_maps_flutter/**                          @stuartmorgan
 packages/google_sign_in/**                               @stuartmorgan
 packages/image_picker/**                                 @tarrinneal
+packages/interactive_media_ads/**                        @bparrishMines
 packages/in_app_purchase/**                              @bparrishMines
 packages/local_auth/**                                   @stuartmorgan
 packages/metrics_center/**                               @keyonghan
@@ -88,8 +89,9 @@ packages/google_sign_in/google_sign_in_ios/**            @vashworth
 packages/image_picker/image_picker_ios/**                @vashworth
 packages/in_app_purchase/in_app_purchase_storekit/**     @louisehsu
 packages/ios_platform_images/**                          @jmagman
-packages/local_auth/local_auth_darwin/**                    @louisehsu
+packages/local_auth/local_auth_darwin/**                 @louisehsu
 packages/path_provider/path_provider_foundation/**       @jmagman
+packages/pigeon/**/ios/**/*                              @hellohuanlin
 packages/pointer_interceptor/pointer_interceptor_ios/**  @ditman
 packages/quick_actions/quick_actions_ios/**              @hellohuanlin
 packages/shared_preferences/shared_preferences_foundation/**  @tarrinneal

diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ These are the packages hosted in this repository:
 | [google\_maps\_flutter](./packages/google_maps_flutter/) | [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dev/packages/google_maps_flutter) | [![pub points](https://img.shields.io/pub/points/google_maps_flutter)](https://pub.dev/packages/google_maps_flutter/score) | [![popularity](https://img.shields.io/pub/popularity/google_maps_flutter)](https://pub.dev/packages/google_maps_flutter/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20maps?label=)](https://github.com/flutter/flutter/labels/p%3A%20maps) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20google_maps_flutter?label=)](https://github.com/flutter/packages/labels/p%3A%20google_maps_flutter) |
 | [google\_sign\_in](./packages/google_sign_in/) | [![pub package](https://img.shields.io/pub/v/google_sign_in.svg)](https://pub.dev/packages/google_sign_in) | [![pub points](https://img.shields.io/pub/points/google_sign_in)](https://pub.dev/packages/google_sign_in/score) | [![popularity](https://img.shields.io/pub/popularity/google_sign_in)](https://pub.dev/packages/google_sign_in/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20google_sign_in?label=)](https://github.com/flutter/flutter/labels/p%3A%20google_sign_in) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20google_sign_in?label=)](https://github.com/flutter/packages/labels/p%3A%20google_sign_in) |
 | [image\_picker](./packages/image_picker/) | [![pub package](https://img.shields.io/pub/v/image_picker.svg)](https://pub.dev/packages/image_picker) | [![pub points](https://img.shields.io/pub/points/image_picker)](https://pub.dev/packages/image_picker/score) | [![popularity](https://img.shields.io/pub/popularity/image_picker)](https://pub.dev/packages/image_picker/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20image_picker?label=)](https://github.com/flutter/flutter/labels/p%3A%20image_picker) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20image_picker?label=)](https://github.com/flutter/packages/labels/p%3A%20image_picker) |
+| [interactive\_media\_ads](./packages/interactive_media_ads/) | [![pub package](https://img.shields.io/pub/v/interactive_media_ads.svg)](https://pub.dev/packages/interactive_media_ads) | [![pub points](https://img.shields.io/pub/points/interactive_media_ads)](https://pub.dev/packages/interactive_media_ads/score) | [![popularity](https://img.shields.io/pub/popularity/interactive_media_ads)](https://pub.dev/packages/interactive_media_ads/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20interactive_media_ads?label=)](https://github.com/flutter/flutter/labels/p%3A%20interactive_media_ads) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20interactive_media_ads?label=)](https://github.com/flutter/packages/labels/p%3A%20interactive_media_ads) |
 | [in\_app\_purchase](./packages/in_app_purchase/) | [![pub package](https://img.shields.io/pub/v/in_app_purchase.svg)](https://pub.dev/packages/in_app_purchase) | [![pub points](https://img.shields.io/pub/points/in_app_purchase)](https://pub.dev/packages/in_app_purchase/score) | [![popularity](https://img.shields.io/pub/popularity/in_app_purchase)](https://pub.dev/packages/in_app_purchase/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20in_app_purchase?label=)](https://github.com/flutter/flutter/labels/p%3A%20in_app_purchase) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20in_app_purchase?label=)](https://github.com/flutter/packages/labels/p%3A%20in_app_purchase) |
 | [ios\_platform\_images](./packages/ios_platform_images/) | [![pub package](https://img.shields.io/pub/v/ios_platform_images.svg)](https://pub.dev/packages/ios_platform_images) | [![pub points](https://img.shields.io/pub/points/ios_platform_images)](https://pub.dev/packages/ios_platform_images/score) | [![popularity](https://img.shields.io/pub/popularity/ios_platform_images)](https://pub.dev/packages/ios_platform_images/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20ios_platform_images?label=)](https://github.com/flutter/flutter/labels/p%3A%20ios_platform_images) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20ios_platform_images?label=)](https://github.com/flutter/packages/labels/p%3A%20ios_platform_images) |
 | [local\_auth](./packages/local_auth/) | [![pub package](https://img.shields.io/pub/v/local_auth.svg)](https://pub.dev/packages/local_auth) | [![pub points](https://img.shields.io/pub/points/local_auth)](https://pub.dev/packages/local_auth/score) | [![popularity](https://img.shields.io/pub/popularity/local_auth)](https://pub.dev/packages/local_auth/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20local_auth?label=)](https://github.com/flutter/flutter/labels/p%3A%20local_auth) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20local_auth?label=)](https://github.com/flutter/packages/labels/p%3A%20local_auth) |

diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
@@ -1,7 +1,12 @@
-## NEXT
+## 0.10.8+18
+
+* Updates annotations lib to 1.7.1.
+
+## 0.10.8+17
 
 * Updates minimum supported SDK version to Flutter 3.13/Dart 3.1.
 * Updates compileSdk version to 34.
+* Updates `README.md` to encourage developers to opt into `camera_android_camerax`.
 
 ## 0.10.8+16
 

diff --git a/packages/camera/camera_android/README.md b/packages/camera/camera_android/README.md
@@ -2,6 +2,12 @@
 
 The Android implementation of [`camera`][1].
 
+*Note*: [`camera_android_camerax`][3] will become the default implementation of
+`camera` on Android by May 2024, so **we strongly encourage you to opt into it**
+by using [these instructions][4]. If any [limitations][5] of `camera_android_camerax`
+prevent you from using it or if you run into any problems, please report these
+issues under [`flutter/flutter`][5] with `[camerax]` in the title.
+
 ## Usage
 
 This package is [endorsed][2], which means you can simply use `camera`
@@ -13,3 +19,6 @@ should add it to your `pubspec.yaml` as usual.
 
 [1]: https://pub.dev/packages/camera
 [2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin
+[3]: https://pub.dev/packages/camera_android_camerax
+[4]: https://pub.dev/packages/camera_android_camerax#usage
+[5]: https://pub.dev/packages/camera_android_camerax#limitations
diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
@@ -65,7 +65,7 @@ buildFeatures {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.7.0'
+    implementation 'androidx.annotation:annotation:1.7.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
     testImplementation 'androidx.test:core:1.4.0'

diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 
-version: 0.10.8+16
+version: 0.10.8+18
 
 environment:
   sdk: ^3.1.0

diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md
@@ -1,5 +1,38 @@
-## NEXT
+## 0.6.2
 
+* Move integration_test dependency to test.
+
+## 0.6.1
+
+* Modifies resolution selection logic to use an `AspectRatioStrategy` for all aspect ratios supported by CameraX.
+* Adds `ResolutionFilter` to resolution selection logic to prioritize resolutions that match
+  the defined `ResolutionPreset`s.
+
+## 0.6.0+1
+
+* Updates `README.md` to encourage developers to opt into this implementation of the camera plugin.
+
+## 0.6.0
+
+* Implements `setFocusMode`, which makes this plugin reach feature parity with camera_android.
+* Fixes `setExposureCompensationIndex` return value to use index returned by CameraX.
+
+## 0.5.0+36
+
+* Implements `setExposureMode`.
+
+## 0.5.0+35
+
+* Modifies `CameraInitializedEvent` that is sent when the camera is initialized to indicate that the initial focus
+  and exposure modes are auto and that developers may set focus and exposure points.
+
+## 0.5.0+34
+
+* Implements `setFocusPoint`, `setExposurePoint`, and `setExposureOffset`.
+
+## 0.5.0+33
+
+* Fixes typo in `README.md`.
 * Updates minimum supported SDK version to Flutter 3.13/Dart 3.1.
 
 ## 0.5.0+32

diff --git a/packages/camera/camera_android_camerax/README.md b/packages/camera/camera_android_camerax/README.md
@@ -2,43 +2,31 @@
 
 An Android implementation of [`camera`][1] that uses the [CameraX library][2].
 
-*Note*: This package is under development, so please note the
-[missing features and limitations](#missing-features-and-limitations), but
-otherwise feel free to try out the current implementation and provide any
-feedback by filing issues under [`flutter/flutter`][5] with `[camerax]` in
-the title, which will be actively triaged.
+*Note*: This implementation will become the default implementation of `camera`
+on Android by May 2024, so **we strongly encourage you to opt into it**
+by using [the instructions](#usage) below. If any of [the limitations](#limitations)
+prevent you from using `camera_android_camerax` or if you run into any problems,
+please report these issues under [`flutter/flutter`][5] with `[camerax]` in
+the title.
 
 ## Usage
 
-This package is [non-endorsed][3]; the endorsed Android implementation of `camera`
-is [`camera_android`][4]. To use this implementation of the plugin instead of
-`camera_android`, you will need to specify it in your `pubsepc.yaml` file as a
-dependency in addition to `camera`:
+To use this plugin instead of [`camera_android`][4], run
 
-```yaml
-dependencies:
-  # ...along with your other dependencies
-  camera: ^0.10.4
-  camera_android_camerax: ^0.5.0
+```sh
+$ flutter pub add camera_android_camerax
 ```
 
-## Missing features and limitations
+from your project's root directory.
 
+## Limitations
 
 ### 240p resolution configuration for video recording
 
 240p resolution configuration for video recording is unsupported by CameraX,
 and thus, the plugin will fall back to 480p if configured with a
 `ResolutionPreset`.
 
-### Exposure mode, point, & offset configuration \[[Issue #120468][120468]\]
-
-`setExposureMode`, `setExposurePoint`, & `setExposureOffset` are unimplemented.
-
-### Focus mode & point configuration \[[Issue #120467][120467]\]
-
-`setFocusMode` & `setFocusPoint` are unimplemented.
-
 ### Setting maximum duration and stream options for video capture
 
 Calling `startVideoCapturing` with `VideoCaptureOptions` configured with

diff --git a/..._camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java b/..._camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java
@@ -27,6 +27,10 @@ public final class CameraAndroidCameraxPlugin implements FlutterPlugin, Activity
   @VisibleForTesting @Nullable public ImageCaptureHostApiImpl imageCaptureHostApiImpl;
   @VisibleForTesting @Nullable public CameraControlHostApiImpl cameraControlHostApiImpl;
   @VisibleForTesting @Nullable public SystemServicesHostApiImpl systemServicesHostApiImpl;
+  @VisibleForTesting @Nullable public MeteringPointHostApiImpl meteringPointHostApiImpl;
+
+  @VisibleForTesting @Nullable
+  public Camera2CameraControlHostApiImpl camera2CameraControlHostApiImpl;
 
   @VisibleForTesting
   public @Nullable DeviceOrientationManagerHostApiImpl deviceOrientationManagerHostApiImpl;
@@ -119,6 +123,19 @@ public void setUp(
     cameraControlHostApiImpl =
         new CameraControlHostApiImpl(binaryMessenger, instanceManager, context);
     GeneratedCameraXLibrary.CameraControlHostApi.setup(binaryMessenger, cameraControlHostApiImpl);
+    camera2CameraControlHostApiImpl = new Camera2CameraControlHostApiImpl(instanceManager, context);
+    GeneratedCameraXLibrary.Camera2CameraControlHostApi.setup(
+        binaryMessenger, camera2CameraControlHostApiImpl);
+    GeneratedCameraXLibrary.CaptureRequestOptionsHostApi.setup(
+        binaryMessenger, new CaptureRequestOptionsHostApiImpl(instanceManager));
+    GeneratedCameraXLibrary.FocusMeteringActionHostApi.setup(
+        binaryMessenger, new FocusMeteringActionHostApiImpl(instanceManager));
+    GeneratedCameraXLibrary.FocusMeteringResultHostApi.setup(
+        binaryMessenger, new FocusMeteringResultHostApiImpl(instanceManager));
+    meteringPointHostApiImpl = new MeteringPointHostApiImpl(instanceManager);
+    GeneratedCameraXLibrary.MeteringPointHostApi.setup(binaryMessenger, meteringPointHostApiImpl);
+    GeneratedCameraXLibrary.ResolutionFilterHostApi.setup(
+        binaryMessenger, new ResolutionFilterHostApiImpl(instanceManager));
   }
 
   @Override
@@ -210,6 +227,9 @@ public void updateContext(@NonNull Context context) {
     if (cameraControlHostApiImpl != null) {
       cameraControlHostApiImpl.setContext(context);
     }
+    if (camera2CameraControlHostApiImpl != null) {
+      camera2CameraControlHostApiImpl.setContext(context);
+    }
   }
 
   /** Sets {@code LifecycleOwner} that is used to control the lifecycle of the camera by CameraX. */
@@ -238,5 +258,8 @@ public void updateActivity(@Nullable Activity activity) {
     if (deviceOrientationManagerHostApiImpl != null) {
       deviceOrientationManagerHostApiImpl.setActivity(activity);
     }
+    if (meteringPointHostApiImpl != null) {
+      meteringPointHostApiImpl.setActivity(activity);
+    }
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		064c340baf0e23790374f5b34ea067c2478e7fd1
		d12ba5c270d83c63cd3c1e89c1cd1f279bbb5696
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		bae5e49bc2a867403c43b2aae2de8f8c33b037e4
		300451adae589accbece3490f4396f10bdf15e6e