From d45cb72ac0d7d57829ffc9223decb89a5fc42ce2 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Mon, 20 Sep 2010 16:15:32 -0700 Subject: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. This constant is not public yet. Continuous autofocus should behave differently in still camera and camcorder. In camcorder, lens movement may be more smooth. And the triggers to start a new focus search may be different. If there is a need, FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future. Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a --- api/current.xml | 4 ++-- core/java/android/hardware/Camera.java | 25 ++++++++++++++----------- include/camera/CameraParameters.h | 14 ++++++++------ libs/camera/CameraParameters.cpp | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/api/current.xml b/api/current.xml index d7fc03d..e6df687 100644 --- a/api/current.xml +++ b/api/current.xml @@ -76944,11 +76944,11 @@ visibility="public" > - mMap; diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index 362d9ee..83e5e57 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() -- cgit v1.1