diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-06-04 03:38:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-04 03:38:25 -0700 |
| commit | cefb01abbfdb175e0c4b298126bcb4a98bf6371f (patch) | |
| tree | fdf01eb997e5a8053bd8527ba7ad6994b8e8776a /libs | |
| parent | 2ea200c5a7c13e6a7e8bfdb04e96066a38b19240 (diff) | |
| parent | 8aba232dbce3d7a1e3efd5fa41c37810de79d0ea (diff) | |
| download | frameworks_base-cefb01abbfdb175e0c4b298126bcb4a98bf6371f.zip frameworks_base-cefb01abbfdb175e0c4b298126bcb4a98bf6371f.tar.gz frameworks_base-cefb01abbfdb175e0c4b298126bcb4a98bf6371f.tar.bz2 | |
Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supporte 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_EDOF[] = "edof"; 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() |