Merge "CAF Continuous Autofocus" into froyo

1 files changed, 38 insertions, 0 deletions

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
          */