am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index b50d4d2..d8f9c71 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -137,6 +137,7 @@
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";
CameraParameters::CameraParameters()
: mMap()
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 3b0e9e5..0d27f1a 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -316,6 +316,12 @@
// continuously. Applications should not call
// CameraHardwareInterface.autoFocus in this mode.
static const char FOCUS_MODE_EDOF[];
+ // Continuous focus mode. The camera continuously tries to focus. This is
+ // ideal for shooting video or shooting photo of moving object. Continuous
+ // focus starts when CameraHardwareInterface.autoFocus is called. Focus
+ // callback will be only called once as soon as the picture is in focus.
+ static const char FOCUS_MODE_CONTINUOUS[];
+
private:
DefaultKeyedVector<String8,String8> mMap;