diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-09-25 19:28:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-25 19:28:03 +0000 |
| commit | 9ca833f4a5eca732b1618bc1a183215c21ae11e5 (patch) | |
| tree | 86daf3d747d3d882ccdc696100014da008b20ce0 /core/java/android/hardware | |
| parent | 1b87107bb37be580888f1617d047ca9009c18a7f (diff) | |
| parent | 9f880f79a3f179443c8b37c3434717432b2ec8d9 (diff) | |
| download | frameworks_base-9ca833f4a5eca732b1618bc1a183215c21ae11e5.zip frameworks_base-9ca833f4a5eca732b1618bc1a183215c21ae11e5.tar.gz frameworks_base-9ca833f4a5eca732b1618bc1a183215c21ae11e5.tar.bz2 | |
Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 20 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 1 |
2 files changed, 16 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index b447494..be556c3 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1071,7 +1071,7 @@ public abstract class CameraMetadata { /** * <p> - * if CONTINUOUS_* modes are supported AF is + * if CONTINUOUS_* modes are supported. AF is * currently doing an AF scan initiated by a continuous * autofocus mode * </p> @@ -1081,7 +1081,7 @@ public abstract class CameraMetadata { /** * <p> - * if CONTINUOUS_* modes are supported AF currently + * if CONTINUOUS_* modes are supported. AF currently * believes it is in focus, but may restart scanning at * any time. * </p> @@ -1091,7 +1091,7 @@ public abstract class CameraMetadata { /** * <p> - * if AUTO or MACRO modes are supported AF is doing + * if AUTO or MACRO modes are supported. AF is doing * an AF scan because it was triggered by AF * trigger * </p> @@ -1101,7 +1101,7 @@ public abstract class CameraMetadata { /** * <p> - * if any AF mode besides OFF is supported AF + * if any AF mode besides OFF is supported. AF * believes it is focused correctly and is * locked * </p> @@ -1111,7 +1111,7 @@ public abstract class CameraMetadata { /** * <p> - * if any AF mode besides OFF is supported AF has + * if any AF mode besides OFF is supported. AF has * failed to focus successfully and is * locked * </p> @@ -1119,6 +1119,16 @@ public abstract class CameraMetadata { */ public static final int CONTROL_AF_STATE_NOT_FOCUSED_LOCKED = 5; + /** + * <p> + * if CONTINUOUS_* modes are supported. AF finished a + * passive scan without finding focus, and may restart + * scanning at any time. + * </p> + * @see CaptureResult#CONTROL_AF_STATE + */ + public static final int CONTROL_AF_STATE_PASSIVE_UNFOCUSED = 6; + // // Enumeration values for CaptureResult#CONTROL_AWB_STATE // diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index b82104d..fc277f1 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -289,6 +289,7 @@ public final class CaptureResult extends CameraMetadata { * @see #CONTROL_AF_STATE_ACTIVE_SCAN * @see #CONTROL_AF_STATE_FOCUSED_LOCKED * @see #CONTROL_AF_STATE_NOT_FOCUSED_LOCKED + * @see #CONTROL_AF_STATE_PASSIVE_UNFOCUSED */ public static final Key<Integer> CONTROL_AF_STATE = new Key<Integer>("android.control.afState", int.class); |