diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-18 10:19:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-18 10:19:45 -0700 |
| commit | c86960236d5b2095c87bf46de2400a905acabee2 (patch) | |
| tree | 3eb3e1cf5abf4179bc503f09a66c7a17afc23bae /core | |
| parent | 4dda6ddb25e904c17dcb3012dd229df6ae4692cd (diff) | |
| parent | f008f3ea82a0518375ee4ea41b32451badffbd95 (diff) | |
| download | frameworks_base-c86960236d5b2095c87bf46de2400a905acabee2.zip frameworks_base-c86960236d5b2095c87bf46de2400a905acabee2.tar.gz frameworks_base-c86960236d5b2095c87bf46de2400a905acabee2.tar.bz2 | |
Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index f72de67..a0abc6c 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1138,9 +1138,9 @@ public class Camera { */ 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"; @@ -1149,6 +1149,12 @@ public class Camera { * {@link #autoFocus(AutoFocusCallback)} in this mode. */ 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"; /** @@ -1170,7 +1176,9 @@ public class Camera { * 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. + * 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"; @@ -1948,6 +1956,7 @@ public class Camera { * @see #FOCUS_MODE_INFINITY * @see #FOCUS_MODE_MACRO * @see #FOCUS_MODE_FIXED + * @see #FOCUS_MODE_EDOF * @see #FOCUS_MODE_CONTINUOUS */ public String getFocusMode() { |