diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 16 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 18 |
3 files changed, 37 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 38b509064759..e7a291a25bf6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15504,6 +15504,8 @@ package android.hardware.camera2 { field public static final int CONTROL_AF_MODE_EDOF = 5; // 0x5 field public static final int CONTROL_AF_MODE_MACRO = 2; // 0x2 field public static final int CONTROL_AF_MODE_OFF = 0; // 0x0 + field public static final int CONTROL_AF_SCENE_CHANGE_DETECTED = 1; // 0x1 + field public static final int CONTROL_AF_SCENE_CHANGE_NOT_DETECTED = 0; // 0x0 field public static final int CONTROL_AF_STATE_ACTIVE_SCAN = 3; // 0x3 field public static final int CONTROL_AF_STATE_FOCUSED_LOCKED = 4; // 0x4 field public static final int CONTROL_AF_STATE_INACTIVE = 0; // 0x0 @@ -15778,6 +15780,7 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_TARGET_FPS_RANGE; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_MODE; field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AF_REGIONS; + field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_SCENE_CHANGE; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_STATE; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_TRIGGER; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> CONTROL_AWB_LOCK; diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 4b57018bfddf..a7a3df7ff372 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -2725,6 +2725,22 @@ public abstract class CameraMetadata<TKey> { public static final int CONTROL_AWB_STATE_LOCKED = 3; // + // Enumeration values for CaptureResult#CONTROL_AF_SCENE_CHANGE + // + + /** + * <p>Scene change is not detected within AF regions.</p> + * @see CaptureResult#CONTROL_AF_SCENE_CHANGE + */ + public static final int CONTROL_AF_SCENE_CHANGE_NOT_DETECTED = 0; + + /** + * <p>Scene change is detected within AF regions.</p> + * @see CaptureResult#CONTROL_AF_SCENE_CHANGE + */ + public static final int CONTROL_AF_SCENE_CHANGE_DETECTED = 1; + + // // Enumeration values for CaptureResult#FLASH_STATE // diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index cfad098c0cd2..b7d7f7d90a31 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2185,6 +2185,24 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { new Key<Boolean>("android.control.enableZsl", boolean.class); /** + * <p>Whether scene change is detected within AF regions.</p> + * <p>When AF detects a scene change within current AF regions, it will be set to DETECTED. Otherwise, + * it will be set to NOT_DETECTED. This value will remain NOT_DETECTED if afMode is AF_MODE_OFF or + * AF_MODE_EDOF.</p> + * <p><b>Possible values:</b> + * <ul> + * <li>{@link #CONTROL_AF_SCENE_CHANGE_NOT_DETECTED NOT_DETECTED}</li> + * <li>{@link #CONTROL_AF_SCENE_CHANGE_DETECTED DETECTED}</li> + * </ul></p> + * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> + * @see #CONTROL_AF_SCENE_CHANGE_NOT_DETECTED + * @see #CONTROL_AF_SCENE_CHANGE_DETECTED + */ + @PublicKey + public static final Key<Integer> CONTROL_AF_SCENE_CHANGE = + new Key<Integer>("android.control.afSceneChange", int.class); + + /** * <p>Operation mode for edge * enhancement.</p> * <p>Edge enhancement improves sharpness and details in the captured image. OFF means |