diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-04-10 11:48:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:48:24 -0700 |
| commit | 926d9a89ed1cd4636001387f98a980381f2eb5c5 (patch) | |
| tree | 8528ec1aeaa4eff832140150b8e4b403185173af /libs | |
| parent | 8e60e09219bc1bfd8a3d514db919a5f7b69fcca3 (diff) | |
| parent | 08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c (diff) | |
| download | frameworks_base-926d9a89ed1cd4636001387f98a980381f2eb5c5.zip frameworks_base-926d9a89ed1cd4636001387f98a980381f2eb5c5.tar.gz frameworks_base-926d9a89ed1cd4636001387f98a980381f2eb5c5.tar.bz2 | |
am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken
* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index 76a9715..b50d4d2 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/camera/CameraParameters.cpp @@ -122,6 +122,7 @@ const char CameraParameters::SCENE_MODE_FIREWORKS[] = "fireworks"; const char CameraParameters::SCENE_MODE_SPORTS[] = "sports"; const char CameraParameters::SCENE_MODE_PARTY[] = "party"; const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight"; +const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode"; // Formats for setPreviewFormat and setPictureFormat. const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp"; @@ -135,6 +136,7 @@ const char CameraParameters::FOCUS_MODE_AUTO[] = "auto"; const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; const char CameraParameters::FOCUS_MODE_MACRO[] = "macro"; const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed"; +const char CameraParameters::FOCUS_MODE_EDOF[] = "edof"; CameraParameters::CameraParameters() : mMap() |