diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-21 08:57:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 08:57:15 -0700 |
| commit | 2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd (patch) | |
| tree | 5cb0918085e3bf00d1b3671f8fe0f7fb4f7e9e06 /core/java/android | |
| parent | e65735aff0f09a1c19b79c6d2b98ef39123da1d4 (diff) | |
| parent | d45cb72ac0d7d57829ffc9223decb89a5fc42ce2 (diff) | |
am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp
* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 26600f35da5f..0d8228ce1e1a 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1182,14 +1182,17 @@ public class Camera { public static final String FOCUS_MODE_EDOF = "edof"; /** - * 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. To stop - * continuous focus, applications should change the focus mode to other - * modes. - */ - public static final String FOCUS_MODE_CONTINUOUS = "continuous"; + * 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. + */ + public static final String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video"; // Indices for focus distance array. /** @@ -2023,7 +2026,7 @@ public class Camera { * @see #FOCUS_MODE_MACRO * @see #FOCUS_MODE_FIXED * @see #FOCUS_MODE_EDOF - * @see #FOCUS_MODE_CONTINUOUS + * @see #FOCUS_MODE_CONTINUOUS_VIDEO */ public String getFocusMode() { return get(KEY_FOCUS_MODE); @@ -2225,8 +2228,8 @@ public class Camera { * #autoFocus(AutoFocusCallback)}, {@link #cancelAutoFocus}, or {@link * #startPreview()}. Applications can call {@link #getParameters()} * and this method anytime to get the latest focus distances. If the - * focus mode is FOCUS_MODE_CONTINUOUS, focus distances may change from - * time to time. + * focus mode is FOCUS_MODE_CONTINUOUS_VIDEO, focus distances may change + * from time to time. * * This method is intended to estimate the distance between the camera * and the subject. After autofocus, the subject distance may be within |