diff options
| -rw-r--r-- | core/java/android/hardware/Camera.java | 15 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 8 |
2 files changed, 18 insertions, 5 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index f72de67..a0abc6c 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -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() { diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 6a5d254..99a3115 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -337,11 +337,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 @@ -355,7 +358,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 |