diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-30 14:06:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 14:06:16 -0700 |
| commit | b8f7f42f70790121f954c2ae3d2e7b915808510a (patch) | |
| tree | b1021e2ca1cc67ee9416b79b3cd2ca11bbfb38f7 /libs/camera | |
| parent | 1ace4163fa8015c58b28aaa7b0d8d49bdee654d1 (diff) | |
| parent | 6e46e6f7488ad1f4e6ab762d141790798fe3f2d5 (diff) | |
| download | frameworks_base-b8f7f42f70790121f954c2ae3d2e7b915808510a.zip frameworks_base-b8f7f42f70790121f954c2ae3d2e7b915808510a.tar.gz frameworks_base-b8f7f42f70790121f954c2ae3d2e7b915808510a.tar.bz2 | |
am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'
* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
Remove camera metering mode API.
Diffstat (limited to 'libs/camera')
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index d0ed7df..362d9ee 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/camera/CameraParameters.cpp @@ -73,8 +73,6 @@ const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported"; const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported"; 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"; @@ -146,11 +144,6 @@ const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed"; const char CameraParameters::FOCUS_MODE_EDOF[] = "edof"; const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous"; -// Values for metering mode settings. -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() { |