diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-08-17 22:24:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 22:24:53 -0700 |
| commit | fde00591c6e3243a7834b21f57e8c386f23aa597 (patch) | |
| tree | 54dd66de3665d0e2aacb490f806f1fbdb6393f43 /core/java/android | |
| parent | 7fa6e4248383ea9d894cc2ac8037cbb04cb13197 (diff) | |
| parent | b9ac75d3dfc53ab4a0a104da147f1dfd7bc8c12f (diff) | |
| download | frameworks_base-fde00591c6e3243a7834b21f57e8c386f23aa597.zip frameworks_base-fde00591c6e3243a7834b21f57e8c386f23aa597.tar.gz frameworks_base-fde00591c6e3243a7834b21f57e8c386f23aa597.tar.bz2 | |
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index cab8457..d3dbb8d 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1613,17 +1613,34 @@ public class Camera { /** * Continuous auto focus mode intended for video recording. The camera - * continuously tries to focus. This is ideal for shooting video. - * Applications still can call {@link - * #takePicture(Camera.ShutterCallback, Camera.PictureCallback, - * Camera.PictureCallback)} in this mode but the subject may not be in - * focus. Auto focus starts when the parameter is set. Applications - * should not call {@link #autoFocus(AutoFocusCallback)} in this mode. - * To stop continuous focus, applications should change the focus mode - * to other modes. + * continuously tries to focus. This is the best choice for video + * recording because the focus changes smoothly . Applications still can + * call {@link #takePicture(Camera.ShutterCallback, + * Camera.PictureCallback, Camera.PictureCallback)} in this mode but the + * subject may not be in focus. Auto focus starts when the parameter is + * set. Applications should not 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_VIDEO = "continuous-video"; + /** + * Continuous auto focus mode intended for taking pictures. The camera + * continuously tries to focus. The speed of focus change is more + * aggressive than {@link #FOCUS_MODE_CONTINUOUS_VIDEO}. Auto focus + * starts when the parameter is set. 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. To stop continuous focus, applications should change + * the focus mode to other modes. + * + * @see #FOCUS_MODE_CONTINUOUS_VIDEO + * @hide + */ + public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture"; + // Indices for focus distance array. /** * The array index of near focus distance for use with |