diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-10-31 21:04:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-31 21:04:01 -0700 |
| commit | 4b6353ea0265bfed52d0637abd1b17596ce25ff0 (patch) | |
| tree | 12db2c3540b8604641509a5597b231636bdcdfff /core/java/android | |
| parent | af675222f6340a8a9edbe9e8635014a18521e5e0 (diff) | |
| parent | 0f4f97b70f6ad59b32e78720ba7357733bdef3e9 (diff) | |
Merge "Update camera continuous autofocus javadoc." into ics-mr0
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index caad6fde9436..68f0247600b1 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -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 */ |