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

Commit 1f272d89 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android (Google) Code Review
Browse files

Merge "camera: Add AF scene change key"

parents 864599ee e8d86eb8

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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;

core/java/android/hardware/camera2/CameraMetadata.java

+16 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,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

    //

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

+18 −0
Original line number Diff line number Diff line
@@ -2184,6 +2184,24 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
    public static final Key<Boolean> CONTROL_ENABLE_ZSL =

            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>