Merge "camera3: focalLength tag frameworks/base changes." (08dd8c49) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -297,11 +297,14 @@ public final class CameraCharacteristics extends CameraMetadata {
		new Key<float[]>("android.lens.info.availableFilterDensities", float[].class);

		/**
		* <p>If fitted with optical zoom, what focal
		* lengths are available. If not, the static focal
		* length</p>
		* <p>If optical zoom not supported, only one value
		* should be reported</p>
		* <p>The available focal lengths for this device for use with
		* {@link CaptureRequest#LENS_FOCAL_LENGTH android.lens.focalLength}.</p>
		* <p>If optical zoom is not supported, this will only report
		* a single value corresponding to the static focal length of the
		* device. Otherwise, this will report every focal length supported
		* by the device.</p>
		*
		* @see CaptureRequest#LENS_FOCAL_LENGTH
		*/
		public static final Key<float[]> LENS_INFO_AVAILABLE_FOCAL_LENGTHS =
		new Key<float[]>("android.lens.info.availableFocalLengths", float[].class);

+14 −2

Original line number	Diff line number	Diff line
		@@ -929,8 +929,20 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		new Key<Float>("android.lens.filterDensity", float.class);

		/**
		* <p>Lens optical zoom setting</p>
		* <p>Will not be supported on most devices.</p>
		* <p>The current lens focal length; used for optical zoom.</p>
		* <p>This setting controls the physical focal length of the camera
		* device's lens. Changing the focal length changes the field of
		* view of the camera device, and is usually used for optical zoom.</p>
		* <p>Like {@link CaptureRequest#LENS_FOCUS_DISTANCE android.lens.focusDistance} and {@link CaptureRequest#LENS_APERTURE android.lens.aperture}, this
		* setting won't be applied instantaneously, and it may take several
		* frames before the lens can move to the requested focal length.
		* While the focal length is still changing, {@link CaptureResult#LENS_STATE android.lens.state} will
		* be set to MOVING.</p>
		* <p>This is expected not to be supported on most devices.</p>
		*
		* @see CaptureRequest#LENS_APERTURE
		* @see CaptureRequest#LENS_FOCUS_DISTANCE
		* @see CaptureResult#LENS_STATE
		*/
		public static final Key<Float> LENS_FOCAL_LENGTH =
		new Key<Float>("android.lens.focalLength", float.class);

+14 −2

Original line number	Diff line number	Diff line
		@@ -1097,8 +1097,20 @@ public final class CaptureResult extends CameraMetadata {
		new Key<Float>("android.lens.filterDensity", float.class);

		/**
		* <p>Lens optical zoom setting</p>
		* <p>Will not be supported on most devices.</p>
		* <p>The current lens focal length; used for optical zoom.</p>
		* <p>This setting controls the physical focal length of the camera
		* device's lens. Changing the focal length changes the field of
		* view of the camera device, and is usually used for optical zoom.</p>
		* <p>Like {@link CaptureRequest#LENS_FOCUS_DISTANCE android.lens.focusDistance} and {@link CaptureRequest#LENS_APERTURE android.lens.aperture}, this
		* setting won't be applied instantaneously, and it may take several
		* frames before the lens can move to the requested focal length.
		* While the focal length is still changing, {@link CaptureResult#LENS_STATE android.lens.state} will
		* be set to MOVING.</p>
		* <p>This is expected not to be supported on most devices.</p>
		*
		* @see CaptureRequest#LENS_APERTURE
		* @see CaptureRequest#LENS_FOCUS_DISTANCE
		* @see CaptureResult#LENS_STATE
		*/
		public static final Key<Float> LENS_FOCAL_LENGTH =
		new Key<Float>("android.lens.focalLength", float.class);