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 | f015774f9d5a8b7af547ccad92d98b5cfd4009fb (patch) | |
| tree | c4edb42e1fbd37cf602ba79a089cd3bbe557961d /camera | |
| parent | dd0f7a7127fdb04863b4ad66d2b846ee94358314 (diff) | |
| parent | fabf86f788260b19ae59e472843164c3bf44e259 (diff) | |
| download | frameworks_av-f015774f9d5a8b7af547ccad92d98b5cfd4009fb.zip frameworks_av-f015774f9d5a8b7af547ccad92d98b5cfd4009fb.tar.gz frameworks_av-f015774f9d5a8b7af547ccad92d98b5cfd4009fb.tar.bz2 | |
am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'
* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
Remove camera metering mode API.
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraParameters.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index d0ed7df..362d9ee 100644 --- a/camera/CameraParameters.cpp +++ b/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() { |