diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-21 08:57:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 08:57:15 -0700 |
| commit | 470644a573b24bc13e0e357a01902322dee0a716 (patch) | |
| tree | dacca2b87bbf27c8a9004bcb9c22f395f8cad422 /camera | |
| parent | 6901625dcb847871e23f04b9a282dc5d313a1d57 (diff) | |
| parent | ac4205c9064ca961883b1ccf2ce565e449c0983e (diff) | |
| download | frameworks_av-470644a573b24bc13e0e357a01902322dee0a716.zip frameworks_av-470644a573b24bc13e0e357a01902322dee0a716.tar.gz frameworks_av-470644a573b24bc13e0e357a01902322dee0a716.tar.bz2 | |
am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp
* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraParameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 362d9ee..83e5e57 100644 --- a/camera/CameraParameters.cpp +++ b/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() |