Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6efbc038 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "camera: Fix ZOOM_METHOD doc" into main

parents b78dbdda 5183b486

core/java/android/hardware/camera2/CaptureRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -2692,7 +2692,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * to control zoom levels.</p>

     * <p>If set to AUTO, the camera device detects which capture request key the application uses

     * to do zoom, {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} or {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}. If

     * the application doesn't set android.scaler.zoomRatio or sets it to 1.0 in the capture

     * the application doesn't set {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} or sets it to 1.0 in the capture

     * request, the effective zoom level is reflected in {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} in capture

     * results. If {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} is set to values other than 1.0, the effective

     * zoom level is reflected in {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}. AUTO is the default value

core/java/android/hardware/camera2/CaptureResult.java

+1 −1
Original line number Diff line number Diff line
@@ -2921,7 +2921,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * to control zoom levels.</p>

     * <p>If set to AUTO, the camera device detects which capture request key the application uses

     * to do zoom, {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} or {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}. If

     * the application doesn't set android.scaler.zoomRatio or sets it to 1.0 in the capture

     * the application doesn't set {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} or sets it to 1.0 in the capture

     * request, the effective zoom level is reflected in {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} in capture

     * results. If {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} is set to values other than 1.0, the effective

     * zoom level is reflected in {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}. AUTO is the default value