From 403ea08d1802aab9639103d09ed8adb3cdb99e6e Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Mon, 11 May 2020 10:17:21 -0700 Subject: [PATCH] Camera: Fix minor doc formatting error Test: Builds Bug: 150331548 Change-Id: Id7b2306486d1a57e0226f641602609debabf7ff9 --- .../android/hardware/camera2/CaptureRequest.java | 12 +++++++----- .../java/android/hardware/camera2/CaptureResult.java | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 6905f83104cde..d071037409a7d 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -2182,11 +2182,13 @@ public final class CaptureRequest extends CameraMetadata> *

By using this control, the application gains a simpler way to control zoom, which can * be a combination of optical and digital zoom. For example, a multi-camera system may * contain more than one lens with different focal lengths, and the user can use optical - * zoom by switching between lenses. Using zoomRatio has benefits in the scenarios below: - * Zooming in from a wide-angle lens to a telephoto lens: A floating-point ratio provides - * better precision compared to an integer value of {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. - * Zooming out from a wide lens to an ultrawide lens: zoomRatio supports zoom-out whereas - * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} doesn't.

+ * zoom by switching between lenses. Using zoomRatio has benefits in the scenarios below:

+ * *

To illustrate, here are several scenarios of different zoom ratios, crop regions, * and output streams, for a hypothetical camera device with an active array of size * (2000,1500).

diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index be03502eb9433..ae04693b4ccfe 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2412,11 +2412,13 @@ public class CaptureResult extends CameraMetadata> { *

By using this control, the application gains a simpler way to control zoom, which can * be a combination of optical and digital zoom. For example, a multi-camera system may * contain more than one lens with different focal lengths, and the user can use optical - * zoom by switching between lenses. Using zoomRatio has benefits in the scenarios below: - * Zooming in from a wide-angle lens to a telephoto lens: A floating-point ratio provides - * better precision compared to an integer value of {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. - * Zooming out from a wide lens to an ultrawide lens: zoomRatio supports zoom-out whereas - * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} doesn't.

+ * zoom by switching between lenses. Using zoomRatio has benefits in the scenarios below:

+ *
    + *
  • Zooming in from a wide-angle lens to a telephoto lens: A floating-point ratio provides + * better precision compared to an integer value of {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}.
  • + *
  • Zooming out from a wide lens to an ultrawide lens: zoomRatio supports zoom-out whereas + * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} doesn't.
  • + *
*

To illustrate, here are several scenarios of different zoom ratios, crop regions, * and output streams, for a hypothetical camera device with an active array of size * (2000,1500).