diff options
| 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 |
| commit | d276720edb060617168388f44005f0960fa89ad1 (patch) | |
| tree | 5dcf22a0d620dfa8cd06858715b8937c580f6487 /libs/camera | |
| parent | 92b328b67a694afc19071c807b80f100663fd5e4 (diff) | |
| parent | 2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd (diff) | |
| download | frameworks_base-d276720edb060617168388f44005f0960fa89ad1.zip frameworks_base-d276720edb060617168388f44005f0960fa89ad1.tar.gz frameworks_base-d276720edb060617168388f44005f0960fa89ad1.tar.bz2 | |
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')
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index 887b12c..af58f77 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() |