Merge "CAF Continuous Autofocus" into froyo

4 files changed, 110 insertions, 0 deletions

diff --git a/api/current.xml b/api/current.xml
index 8bb69ea..f8b77a4 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -71998,6 +71998,17 @@
  visibility="public"
 >
 </method>
+<method name="getContinuousAf"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getContrast"
  return="int"
  abstract="false"
@@ -72385,6 +72396,17 @@
  visibility="public"
 >
 </method>
+<method name="getSupportedContinuousAfModes"
+ return="java.util.List&lt;java.lang.String&gt;"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getSupportedFlashModes"
  return="java.util.List&lt;java.lang.String&gt;"
  abstract="false"
@@ -72700,6 +72722,19 @@
 <parameter name="value" type="java.lang.String">
 </parameter>
 </method>
+<method name="setContinuousAf"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="value" type="java.lang.String">
+</parameter>
+</method>
 <method name="setContrast"
  return="void"
  abstract="false"
@@ -73134,6 +73169,28 @@
  visibility="public"
 >
 </field>
+<field name="CAF_OFF"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;caf-off&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="CAF_ON"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;caf-on&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="EFFECT_AQUA"
  type="java.lang.String"
  transient="false"
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 04d86a0..9fafe59 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -942,6 +942,7 @@ public class Camera {
         private static final String KEY_MAX_BRIGHTNESS = "brightness-max";
         private static final String KEY_DEFAULT_BRIGHTNESS = "brightness-def";
         private static final String KEY_SMART_CONTRAST = "smart-contrast";
+        private static final String KEY_CAF = "continuous-af";
         
         // Parameter key suffix for supported values.
         private static final String SUPPORTED_VALUES_SUFFIX = "-values";
@@ -1085,6 +1086,11 @@ public class Camera {
         private static final String PIXEL_FORMAT_RGB565 = "rgb565";
         private static final String PIXEL_FORMAT_JPEG = "jpeg";
 
+        //Values for Continuous AF
+
+        public static final String CAF_OFF = "caf-off";
+        public static final String CAF_ON = "caf-on";
+
         private HashMap<String, String> mMap;
 
         private Parameters() {
@@ -2270,6 +2276,38 @@ public class Camera {
         }
 
         /**
+         * Gets the current Continuous AF setting.
+         *
+         * @return one of CONTINUOUS_AF_XXX string constant. null if continuous AF
+         *         setting is not supported.
+         *
+         */
+        public String getContinuousAf() {
+            return get(KEY_CAF);
+        }
+
+        /**
+         * Sets the current Continuous AF mode.
+         * @param value CONTINUOUS_AF_XXX string constants.
+         *
+         */
+        public void setContinuousAf(String value) {
+            set(KEY_CAF, value);
+        }
+
+        /**
+         * Gets the supported Continuous AF modes.
+         *
+         * @return a List of CONTINUOUS_AF_XXX string constant. null if continuous AF
+         *         setting is not supported.
+         *
+         */
+        public List<String> getSupportedContinuousAfModes() {
+            String str = get(KEY_CAF + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+        }
+
+        /**
          * Sets the smart-contrast feature
          * @param boolean
          */
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index dde56a9..19f1caa 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -264,6 +264,10 @@ public:
     // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.
     static const char TRUE[];
 
+    //Continuous AF.
+    static const char KEY_CAF[];
+    static const char KEY_SUPPORTED_CAF[];
+
     // Values for white balance settings.
     static const char WHITE_BALANCE_AUTO[];
     static const char WHITE_BALANCE_INCANDESCENT[];
@@ -362,6 +366,11 @@ public:
     // Values for Lens Shading
     static const char LENSSHADE_ENABLE[] ;
     static const char LENSSHADE_DISABLE[] ;
+
+    // Values for Continuous AF
+    static const char CAF_OFF[] ;
+    static const char CAF_ON[] ;
+
 private:
     DefaultKeyedVector<String8,String8>    mMap;
 };
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index 12b08f0..9efd039 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -69,6 +69,8 @@ const char CameraParameters::KEY_MAX_ZOOM[] = "max-zoom";
 const char CameraParameters::KEY_ZOOM_RATIOS[] = "zoom-ratios";
 const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported";
 const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported";
+const char CameraParameters::KEY_CAF[] = "continuous-af";
+const char CameraParameters::KEY_SUPPORTED_CAF[] = "continuous-af-values";
 
 const char CameraParameters::TRUE[] = "true";
 
@@ -182,6 +184,10 @@ const char CameraParameters::ISO_1600[] = "ISO1600";
 const char CameraParameters::LENSSHADE_ENABLE[] = "enable";
 const char CameraParameters::LENSSHADE_DISABLE[] = "disable";
 
+//Values for Continuous AF
+const char CameraParameters::CAF_OFF[] = "caf-off";
+const char CameraParameters::CAF_ON[] = "caf-on";
+
 static const char* portrait = "portrait";
 static const char* landscape = "landscape";