Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.

Browse Source 
Merge commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp

* commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b':
  Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
This commit is contained in:
Wu-cheng Li
2009-09-28 14:13:11 -07:00
committed by Android Git Automerger
parent 25c70dd9a1 fe1a86df8b
commit 90b4a93271
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/ui/CameraParameters.h
View File

@@ -215,15 +215,17 @@ public:
// Values for flash mode settings. // Values for flash mode settings.
// Flash will not be fired. // Flash will not be fired.
static const char FLASH_MODE_OFF[]; static const char FLASH_MODE_OFF[];
// Flash will be fired automatically when required. The timing is decided by // Flash will be fired automatically when required. The flash may be fired
// camera driver. // during preview, auto-focus, or snapshot depending on the driver.
static const char FLASH_MODE_AUTO[]; 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[]; static const char FLASH_MODE_ON[];
// Flash will be fired in red-eye reduction mode. // Flash will be fired in red-eye reduction mode.
static const char FLASH_MODE_RED_EYE[]; static const char FLASH_MODE_RED_EYE[];
// Constant emission of light. This can be used for video recording. // Constant emission of light during preview, auto-focus and snapshot.
static const char FLASH_MODE_VIDEO_LIGHT[]; // This can also be used for video recording.
static const char FLASH_MODE_TORCH[];
// Values for scene mode settings. // Values for scene mode settings.
static const char SCENE_MODE_AUTO[]; static const char SCENE_MODE_AUTO[];

2
libs/ui/CameraParameters.cpp
View File

@@ -89,7 +89,7 @@ const char CameraParameters::FLASH_MODE_OFF[] = "off";
const char CameraParameters::FLASH_MODE_AUTO[] = "auto"; const char CameraParameters::FLASH_MODE_AUTO[] = "auto";
const char CameraParameters::FLASH_MODE_ON[] = "on"; const char CameraParameters::FLASH_MODE_ON[] = "on";
const char CameraParameters::FLASH_MODE_RED_EYE[] = "red-eye"; const char CameraParameters::FLASH_MODE_RED_EYE[] = "red-eye";
const char CameraParameters::FLASH_MODE_VIDEO_LIGHT[] = "video-light"; const char CameraParameters::FLASH_MODE_TORCH[] = "torch";
// Values for scene mode settings. // Values for scene mode settings.
const char CameraParameters::SCENE_MODE_AUTO[] = "auto"; const char CameraParameters::SCENE_MODE_AUTO[] = "auto";