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

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

am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 

Merge commit 'd45cb72a' into gingerbread-plus-aosp

* commit 'd45cb72a':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
parents e65735af d45cb72a

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -78601,11 +78601,11 @@ 
 visibility="public"

>

</field>

<field name="FOCUS_MODE_CONTINUOUS"

<field name="FOCUS_MODE_CONTINUOUS_VIDEO"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;continuous&quot;"

 value="&quot;continuous-video&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/hardware/Camera.java

+14 −11
Original line number Diff line number Diff line
@@ -1182,14 +1182,17 @@ public class Camera { 
        public static final String FOCUS_MODE_EDOF = "edof";



        /**

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

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

         * Auto focus starts when the parameter is set. Applications should not

         * call {@link #autoFocus(AutoFocusCallback)} in this mode. To stop

         * continuous focus, applications should change the focus mode to other

         * modes.

         */

        public static final String FOCUS_MODE_CONTINUOUS = "continuous";

         * Continuous auto focus mode intended for video recording. The camera

         * continuously tries to focus. This is ideal for shooting video.

         * Applications still can call {@link

         * #takePicture(Camera.ShutterCallback, Camera.PictureCallback,

         * Camera.PictureCallback)} in this mode but the subject may not be in

         * focus. Auto focus starts when the parameter is set. Applications

         * should not call {@link #autoFocus(AutoFocusCallback)} in this mode.

         * To stop continuous focus, applications should change the focus mode

         * to other modes.

         */

        public static final String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video";



        // Indices for focus distance array.

        /**
@@ -2023,7 +2026,7 @@ public class Camera { 
         * @see #FOCUS_MODE_MACRO

         * @see #FOCUS_MODE_FIXED

         * @see #FOCUS_MODE_EDOF

         * @see #FOCUS_MODE_CONTINUOUS

         * @see #FOCUS_MODE_CONTINUOUS_VIDEO

         */

        public String getFocusMode() {

            return get(KEY_FOCUS_MODE);
@@ -2225,8 +2228,8 @@ public class Camera { 
         * #autoFocus(AutoFocusCallback)}, {@link #cancelAutoFocus}, or {@link

         * #startPreview()}. Applications can call {@link #getParameters()}

         * and this method anytime to get the latest focus distances. If the

         * focus mode is FOCUS_MODE_CONTINUOUS, focus distances may change from

         * time to time.

         * focus mode is FOCUS_MODE_CONTINUOUS_VIDEO, focus distances may change

         * from time to time.

         *

         * This method is intended to estimate the distance between the camera

         * and the subject. After autofocus, the subject distance may be within

include/camera/CameraParameters.h

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

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_EDOF[];

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

    // is ideal for shooting video or shooting photo of moving object. Auto

    // focus starts when the parameter is set. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.  To stop continuous

    // focus, applications should change the focus mode to other modes.

    static const char FOCUS_MODE_CONTINUOUS[];

    // Continuous auto focus mode intended for video recording. The camera

    // continuously tries to focus. This is ideal for shooting video.

    // Applications still can call CameraHardwareInterface.takePicture in this

    // mode but the subject may not be in focus. Auto focus starts when the

    // parameter is set. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode. To stop continuous focus,

    // applications should change the focus mode to other modes.

    static const char FOCUS_MODE_CONTINUOUS_VIDEO[];



private:

    DefaultKeyedVector<String8,String8>    mMap;

libs/camera/CameraParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,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";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";



CameraParameters::CameraParameters()

                : mMap()