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

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

am a2527055: am c8696023: Merge "Document that autoFocus must be called in... 

am a2527055: am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread

Merge commit 'a2527055'

* commit 'a2527055':
  Document that autoFocus must be called in auto and macro mode.
parents f5a36b24 a2527055

core/java/android/hardware/Camera.java

+12 −3
Original line number Diff line number Diff line
@@ -1138,9 +1138,9 @@ public class Camera { 
         */

        public static final String SCENE_MODE_BARCODE = "barcode";



        // Values for focus mode settings.

        /**

         * Auto-focus mode.

         * Auto-focus mode. Applications should call {@link

         * #autoFocus(AutoFocusCallback)} to start the focus in this mode.

         */

        public static final String FOCUS_MODE_AUTO = "auto";
@@ -1149,6 +1149,12 @@ public class Camera { 
         * {@link #autoFocus(AutoFocusCallback)} in this mode.

         */

        public static final String FOCUS_MODE_INFINITY = "infinity";



        /**

         * Macro (close-up) focus mode. Applications should call

         * {@link #autoFocus(AutoFocusCallback)} to start the focus in this

         * mode.

         */

        public static final String FOCUS_MODE_MACRO = "macro";



        /**
@@ -1170,7 +1176,9 @@ public class Camera { 
         * 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.

         * 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";
@@ -1948,6 +1956,7 @@ public class Camera { 
         * @see #FOCUS_MODE_INFINITY

         * @see #FOCUS_MODE_MACRO

         * @see #FOCUS_MODE_FIXED

         * @see #FOCUS_MODE_EDOF

         * @see #FOCUS_MODE_CONTINUOUS

         */

        public String getFocusMode() {

include/camera/CameraParameters.h

+6 −2
Original line number Diff line number Diff line
@@ -354,11 +354,14 @@ public: 
    static const char PIXEL_FORMAT_JPEG[];



    // Values for focus mode settings.

    // Auto-focus mode.

    // Auto-focus mode. Applications should call

    // CameraHardwareInterface.autoFocus to start the focus in this mode.

    static const char FOCUS_MODE_AUTO[];

    // Focus is set at infinity. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_INFINITY[];

    // Macro (close-up) focus mode. Applications should call

    // CameraHardwareInterface.autoFocus to start the focus in this mode.

    static const char FOCUS_MODE_MACRO[];

    // Focus is fixed. The camera is always in this mode if the focus is not

    // adjustable. If the camera has auto-focus, this mode can fix the
@@ -372,7 +375,8 @@ public: 
    // 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.

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

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

    static const char FOCUS_MODE_CONTINUOUS[];



    // The camera determines the exposure by giving more weight to the