diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 4f63c42d1f9..5c8002bae00 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,8 @@ +## 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`. diff --git a/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart b/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart index deddf4709c9..ffff56b4d96 100644 --- a/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart +++ b/packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart @@ -347,16 +347,13 @@ class AndroidCameraCameraX extends CameraPlatform { final ResolutionInfo previewResolutionInfo = await preview!.getResolutionInfo(); - // Retrieve exposure and focus mode configurations: - // TODO(camsim99): Implement support for retrieving exposure mode configuration. - // https://github.com/flutter/flutter/issues/120468 + // Mark auto-focus, auto-exposure and setting points for focus & exposure + // as available operations as CameraX does its best across devices to + // support these by default. const ExposureMode exposureMode = ExposureMode.auto; - const bool exposurePointSupported = false; - - // TODO(camsim99): Implement support for retrieving focus mode configuration. - // https://github.com/flutter/flutter/issues/120467 const FocusMode focusMode = FocusMode.auto; - const bool focusPointSupported = false; + const bool exposurePointSupported = true; + const bool focusPointSupported = true; cameraEventStreamController.add(CameraInitializedEvent( cameraId, diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index 3df56f5e1db..9e151c368ef 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/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+34 +version: 0.5.0+35 environment: sdk: ^3.1.0 diff --git a/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart b/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart index 0868916f3bf..3998860bfb5 100644 --- a/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart +++ b/packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart @@ -755,19 +755,15 @@ void main() { startListeningForDeviceOrientationChange: (_, __) {}, ); - // TODO(camsim99): Modify this when camera configuration is supported and - // default values no longer being used. - // https://github.com/flutter/flutter/issues/120468 - // https://github.com/flutter/flutter/issues/120467 final CameraInitializedEvent testCameraInitializedEvent = CameraInitializedEvent( cameraId, resolutionWidth.toDouble(), resolutionHeight.toDouble(), ExposureMode.auto, - false, + true, FocusMode.auto, - false); + true); // Call createCamera. when(mockPreview.setSurfaceProvider()).thenAnswer((_) async => cameraId);