summaryrefslogtreecommitdiff
path: root/libs/camera/CameraParameters.cpp
diff options
context:
space:
mode:
author Wu-cheng Li <wuchengli@google.com> 2010-09-21 10:44:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-21 10:44:38 -0700
commitd276720edb060617168388f44005f0960fa89ad1 (patch)
tree5dcf22a0d620dfa8cd06858715b8937c580f6487 /libs/camera/CameraParameters.cpp
parent92b328b67a694afc19071c807b80f100663fd5e4 (diff)
parent2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd (diff)
am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd' * commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd': Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Diffstat (limited to 'libs/camera/CameraParameters.cpp')
-rw-r--r--libs/camera/CameraParameters.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index 887b12ca5c2d..af58f776b21a 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -142,7 +142,7 @@ 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";
-const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";
+const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";
CameraParameters::CameraParameters()
: mMap()