commit 8aba232dbce3d7a1e3efd5fa41c37810de79d0ea
author Wu-cheng Li <wuchengli@google.com> Fri Jun 04 14:18:32 2010 +0800
committer Wu-cheng Li <wuchengli@google.com> Fri Jun 04 17:18:17 2010 +0800
tree 895d4ec947f9974da6bd1152ea393893863e9239
parent 5f5df382e5b87f02399f21c916e0ebb6c48c759d

Add KEY_SUPPORTED_METERING_MODES and fix some typos.

bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448

include/camera/CameraParameters.h

diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 4840b40..e12a694 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -253,6 +253,9 @@
     // Metering mode. This affects how camera determines exposure.
     // Example value: "spot" or METERING_MODE_XXX constants. Read/write.
     static const char KEY_METERING_MODE[];
+    // Supported metering modes.
+    // Example value: "center-weighted,frame-average,spot". Read only.
+    static const char KEY_SUPPORTED_METERING_MODES[];
 
     // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.
     static const char TRUE[];

libs/camera/CameraParameters.cpp

diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index c11d18f..1415493 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -72,6 +72,7 @@
 const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";
 const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";
 const char CameraParameters::KEY_METERING_MODE[] = "metering-mode";
+const char CameraParameters::KEY_SUPPORTED_METERING_MODES[] = "metering-mode-values";
 
 const char CameraParameters::TRUE[] = "true";
 const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
@@ -144,9 +145,9 @@
 const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";
 
 // Values for metering mode settings.
-const char METERING_MODE_CENTER_WEIGHTED[] = "center-weighted";
-const char METERING_MODE_FRAME_AVERAGE[] = "frame-average";
-const char METERING_MODE_SPOT[] = "spot";
+const char CameraParameters::METERING_MODE_CENTER_WEIGHTED[] = "center-weighted";
+const char CameraParameters::METERING_MODE_FRAME_AVERAGE[] = "frame-average";
+const char CameraParameters::METERING_MODE_SPOT[] = "spot";
 
 CameraParameters::CameraParameters()
                 : mMap()