diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-27 22:13:43 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-27 22:13:43 -0400 |
| commit | e883847f177665102ebc6b2369dbfbfd1e79cf62 (patch) | |
| tree | 671c24e355fcd33f2c19d5196f152eac26091654 /core/java/android | |
| parent | 960972d465d6890d51c73fc08dda7fb17825ce7f (diff) | |
| parent | 068ef42c3ffe1eccec10f97f08541304f679fe67 (diff) | |
Merge change 27292 into eclair
* changes:
Add documentation about flash and change video-light to torch.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index e47ea8467901..a1da0e489710 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -368,6 +368,9 @@ public class Camera { * uses auto-focus with the * <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a> * manifest element.</p> + * <p>If the current flash mode is not + * {@link android.hardware.Camera.Parameters#FLASH_MODE_OFF}, flash may be + * fired during auto-focus depending on the driver.<p> * * @param cb the callback to run */ @@ -637,12 +640,13 @@ public class Camera { */ public static final String FLASH_MODE_OFF = "off"; /** - * Flash will be fired automatically when required. The timing is - * decided by camera driver. + * Flash will be fired automatically when required. The flash may be fired + * during preview, auto-focus, or snapshot depending on the driver. */ public static final String FLASH_MODE_AUTO = "auto"; /** - * Flash will always be fired. The timing is decided by camera driver. + * Flash will always be fired during snapshot. The flash may also be + * fired during preview or auto-focus depending on the driver. */ public static final String FLASH_MODE_ON = "on"; /** @@ -650,9 +654,10 @@ public class Camera { */ public static final String FLASH_MODE_RED_EYE = "red-eye"; /** - * Constant emission of light. This can be used for video recording. + * Constant emission of light during preview, auto-focus and snapshot. + * This can also be used for video recording. */ - public static final String FLASH_MODE_VIDEO_LIGHT = "video-light"; + public static final String FLASH_MODE_TORCH = "torch"; // Values for scene mode settings. public static final String SCENE_MODE_AUTO = "auto"; |