drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0

Browse Source 
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
This commit is contained in:
Chih-Chung Chang
2011-11-01 04:05:45 +00:00
committed by Android Git Automerger
parent ff93e417a2 4b6353ea02
commit 11ba6da460
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1687,15 +1687,18 @@ public class Camera {
* aggressive than {@link #FOCUS_MODE_CONTINUOUS_VIDEO}. Auto focus
* starts when the parameter is set.
*
* <p>If applications call {@link #autoFocus(AutoFocusCallback)} in this
* mode, the focus callback will immediately return with a boolean that
* indicates whether the focus is sharp or not. The apps can then decide
* if they want to take a picture immediately or to change the focus
* mode to auto, and run a full autofocus cycle. The focus position is
* locked after autoFocus call. If applications want to resume the
* continuous focus, cancelAutoFocus must be called. Restarting the
* preview will not resume the continuous autofocus. To stop continuous
* focus, applications should change the focus mode to other modes.
* <p>Applications can call {@link #autoFocus(AutoFocusCallback)} in
* this mode. If the autofocus is in the middle of scanning, the focus
* callback will return when it completes. If the autofocus is not
* scanning, the focus callback will immediately return with a boolean
* that indicates whether the focus is sharp or not. The apps can then
* decide if they want to take a picture immediately or to change the
* focus mode to auto, and run a full autofocus cycle. The focus
* position is locked after autoFocus call. If applications want to
* resume the continuous focus, cancelAutoFocus must be called.
* Restarting the preview will not resume the continuous autofocus. To
* stop continuous focus, applications should change the focus mode to
* other modes.
*
* @see #FOCUS_MODE_CONTINUOUS_VIDEO
*/

20
include/camera/CameraParameters.h
View File

@ -644,15 +644,17 @@ public:
// than FOCUS_MODE_CONTINUOUS_VIDEO. Auto focus starts when the parameter is
// set.
//
// If applications call CameraHardwareInterface.autoFocus in this mode, the
// focus callback will immediately return with a boolean that indicates
// whether the focus is sharp or not. The apps can then decide if they want
// to take a picture immediately or to change the focus mode to auto, and
// run a full autofocus cycle. The focus position is locked after autoFocus
// call. If applications want to resume the continuous focus,
// cancelAutoFocus must be called. Restarting the preview will not resume
// the continuous autofocus. To stop continuous focus, applications should
// change the focus mode to other modes.
// Applications can call CameraHardwareInterface.autoFocus in this mode. If
// the autofocus is in the middle of scanning, the focus callback will
// return when it completes. If the autofocus is not scanning, focus
// callback will immediately return with a boolean that indicates whether
// the focus is sharp or not. The apps can then decide if they want to take
// a picture immediately or to change the focus mode to auto, and run a full
// autofocus cycle. The focus position is locked after autoFocus call. If
// applications want to resume the continuous focus, cancelAutoFocus must be
// called. Restarting the preview will not resume the continuous autofocus.
// To stop continuous focus, applications should change the focus mode to
// other modes.
static const char FOCUS_MODE_CONTINUOUS_PICTURE[];
private: