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

Commit f0b8679b authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android Git Automerger
Browse files

am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken

parents 6707341b 0c3bba3e

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -77451,6 +77451,17 @@ 
 visibility="public"

>

</field>

<field name="FOCUS_MODE_CONTINUOUS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;continuous&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FOCUS_MODE_EDOF"

 type="java.lang.String"

 transient="false"

core/java/android/hardware/Camera.java

+10 −0
Original line number Diff line number Diff line
@@ -874,6 +874,16 @@ public class Camera { 
         */

        public static final String FOCUS_MODE_EDOF = "edof";



        /**

         * Continuous focus mode. The camera continuously tries to focus. This

         * is ideal for shooting video or shooting photo of moving object.

         * Continuous focus starts when {@link #autoFocus(AutoFocusCallback)} is

         * called. AutoFocusCallback will be only called once as soon as the

         * picture is in focus.

         */

        public static final String FOCUS_MODE_CONTINUOUS = "continuous";





        // Formats for setPreviewFormat and setPictureFormat.

        private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp";

        private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp";

include/camera/CameraParameters.h

+6 −0
Original line number Diff line number Diff line
@@ -316,6 +316,12 @@ public: 
    // continuously. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_EDOF[];

    // Continuous focus mode. The camera continuously tries to focus. This is

    // ideal for shooting video or shooting photo of moving object. Continuous

    // focus starts when CameraHardwareInterface.autoFocus is called. Focus

    // callback will be only called once as soon as the picture is in focus.

    static const char FOCUS_MODE_CONTINUOUS[];





private:

    DefaultKeyedVector<String8,String8>    mMap;

libs/camera/CameraParameters.cpp

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; 
const char CameraParameters::FOCUS_MODE_MACRO[] = "macro";

const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";

const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";

const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";



CameraParameters::CameraParameters()

                : mMap()