Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wu-cheng Li
2010-08-18 10:19:45 -07:00
committed by Android (Google) Code Review
parent 4dda6ddb25 f008f3ea82
commit c86960236d
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/hardware/Camera.java
View File

@@ -1138,9 +1138,9 @@ public class Camera {
*/ */
public static final String SCENE_MODE_BARCODE = "barcode"; 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"; public static final String FOCUS_MODE_AUTO = "auto";
@@ -1149,6 +1149,12 @@ public class Camera {
* {@link #autoFocus(AutoFocusCallback)} in this mode. * {@link #autoFocus(AutoFocusCallback)} in this mode.
*/ */
public static final String FOCUS_MODE_INFINITY = "infinity"; 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"; 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. * Continuous auto focus mode. The camera continuously tries to focus.
* This is ideal for shooting video or shooting photo of moving object. * This is ideal for shooting video or shooting photo of moving object.
* Auto focus starts when the parameter is set. Applications should not * 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"; public static final String FOCUS_MODE_CONTINUOUS = "continuous";
@@ -1948,6 +1956,7 @@ public class Camera {
* @see #FOCUS_MODE_INFINITY * @see #FOCUS_MODE_INFINITY
* @see #FOCUS_MODE_MACRO * @see #FOCUS_MODE_MACRO
* @see #FOCUS_MODE_FIXED * @see #FOCUS_MODE_FIXED
* @see #FOCUS_MODE_EDOF
* @see #FOCUS_MODE_CONTINUOUS * @see #FOCUS_MODE_CONTINUOUS
*/ */
public String getFocusMode() { public String getFocusMode() {

8
include/camera/CameraParameters.h
View File

@@ -337,11 +337,14 @@ public:
static const char PIXEL_FORMAT_JPEG[]; static const char PIXEL_FORMAT_JPEG[];
// Values for focus mode settings. // 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[]; static const char FOCUS_MODE_AUTO[];
// Focus is set at infinity. Applications should not call // Focus is set at infinity. Applications should not call
// CameraHardwareInterface.autoFocus in this mode. // CameraHardwareInterface.autoFocus in this mode.
static const char FOCUS_MODE_INFINITY[]; 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[]; static const char FOCUS_MODE_MACRO[];
// Focus is fixed. The camera is always in this mode if the focus is not // 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 // 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 // Continuous auto focus mode. The camera continuously tries to focus. This
// is ideal for shooting video or shooting photo of moving object. Auto // is ideal for shooting video or shooting photo of moving object. Auto
// focus starts when the parameter is set. Applications should not call // 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[]; static const char FOCUS_MODE_CONTINUOUS[];
// The camera determines the exposure by giving more weight to the // The camera determines the exposure by giving more weight to the