am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken

2010-06-04 03:41:44 -07:00
parent 4b18200b9c ab5e67c60d
commit baff93de27
2 changed files with 7 additions and 3 deletions
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -253,6 +253,9 @@ public:
    // 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[];