summaryrefslogtreecommitdiffstats
path: root/libs/camera/CameraParameters.cpp
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-04-13 01:14:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-13 01:14:42 -0700
commitfda06c0cd9bf1db78adcddf11d374785c6737b61 (patch)
treeb544b475103adec40eea25fcb90b0cecc59082eb /libs/camera/CameraParameters.cpp
parent2432d1bd4828d10d97cf72f974d8312a168bb2ca (diff)
parente98e4c806320ccb3078805ac019cca3ed9796123 (diff)
downloadframeworks_base-fda06c0cd9bf1db78adcddf11d374785c6737b61.zip
frameworks_base-fda06c0cd9bf1db78adcddf11d374785c6737b61.tar.gz
frameworks_base-fda06c0cd9bf1db78adcddf11d374785c6737b61.tar.bz2
Merge "Add camera metering area API."
Diffstat (limited to 'libs/camera/CameraParameters.cpp')
-rw-r--r--libs/camera/CameraParameters.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index 1e7abae..214cd4d 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -68,6 +68,8 @@ const char CameraParameters::KEY_EXPOSURE_COMPENSATION[] = "exposure-compensatio
const char CameraParameters::KEY_MAX_EXPOSURE_COMPENSATION[] = "max-exposure-compensation";
const char CameraParameters::KEY_MIN_EXPOSURE_COMPENSATION[] = "min-exposure-compensation";
const char CameraParameters::KEY_EXPOSURE_COMPENSATION_STEP[] = "exposure-compensation-step";
+const char CameraParameters::KEY_MAX_NUM_METERING_AREAS[] = "max-num-metering-areas";
+const char CameraParameters::KEY_METERING_AREAS[] = "metering-areas";
const char CameraParameters::KEY_ZOOM[] = "zoom";
const char CameraParameters::KEY_MAX_ZOOM[] = "max-zoom";
const char CameraParameters::KEY_ZOOM_RATIOS[] = "zoom-ratios";