summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-09-28 13:51:12 -0700
committerWu-cheng Li <wuchengli@google.com>2009-09-28 13:51:59 -0700
commitfe1a86df8b1c23e3290f96dce69984bf979a462b (patch)
tree26a6b2a07b27553efe5d6d905eb3226a50eb5071 /include
parent279ba943553ec2368d14e1b3c8a88c36bf17785d (diff)
downloadframeworks_base-fe1a86df8b1c23e3290f96dce69984bf979a462b.zip
frameworks_base-fe1a86df8b1c23e3290f96dce69984bf979a462b.tar.gz
frameworks_base-fe1a86df8b1c23e3290f96dce69984bf979a462b.tar.bz2
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Diffstat (limited to 'include')
-rw-r--r--include/ui/CameraParameters.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/ui/CameraParameters.h b/include/ui/CameraParameters.h
index 9c3d4f0..9e4e140 100644
--- a/include/ui/CameraParameters.h
+++ b/include/ui/CameraParameters.h
@@ -215,15 +215,17 @@ public:
// Values for flash mode settings.
// Flash will not be fired.
static const char FLASH_MODE_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.
static const char FLASH_MODE_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.
static const char FLASH_MODE_ON[];
// Flash will be fired in red-eye reduction mode.
static const char FLASH_MODE_RED_EYE[];
- // Constant emission of light. This can be used for video recording.
- static const char FLASH_MODE_VIDEO_LIGHT[];
+ // Constant emission of light during preview, auto-focus and snapshot.
+ // This can also be used for video recording.
+ static const char FLASH_MODE_TORCH[];
// Values for scene mode settings.
static const char SCENE_MODE_AUTO[];