diff options
author | Wei Huang <weih@google.com> | 2011-10-18 06:38:04 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-18 06:38:04 -0700 |
commit | ff55f519629fbe839fe051108b396565403d696e (patch) | |
tree | f7d676d447d2b9211c1bcb266df235162cabcc5f /src/com/android/camera/Camera.java | |
parent | e4a29ba9b6e04a0e708d3653ecba927968d8da59 (diff) | |
parent | bcb097dbf1319edc84ae9bed51fa30b3ae6e3fd1 (diff) | |
download | LegacyCamera-ff55f519629fbe839fe051108b396565403d696e.zip LegacyCamera-ff55f519629fbe839fe051108b396565403d696e.tar.gz LegacyCamera-ff55f519629fbe839fe051108b396565403d696e.tar.bz2 |
Merge "Lock AE and AWB before autofocus starts." into ics-mr0
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r-- | src/com/android/camera/Camera.java | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index a0782f8..4eb3d4f 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -122,6 +122,9 @@ public class Camera extends ActivityBase implements FocusManager.Listener, private Parameters mInitialParams; private boolean mFocusAreaSupported; private boolean mMeteringAreaSupported; + private boolean mAeLockSupported; + private boolean mAwbLockSupported; + private boolean mAeAwbLock; private MyOrientationEventListener mOrientationListener; // The degrees of the device rotated clockwise from its natural orientation. @@ -1357,7 +1360,19 @@ public class Camera extends ActivityBase implements FocusManager.Listener, // Do not do focus if there is not enough storage. if (pressed && !canTakePicture()) return; + // Lock AE and AWB so users can half-press shutter and recompose. + mAeAwbLock = pressed; + if (mAeAwbLock && (mAeLockSupported || mAwbLockSupported)) { + setCameraParameters(UPDATE_PARAM_PREFERENCE); + } + mFocusManager.doFocus(pressed); + + // Unlock AE and AWB after cancelAutoFocus. Camera API does not + // guarantee setParameters can be called during autofocus. + if (!mAeAwbLock && (mAeLockSupported || mAwbLockSupported)) { + setCameraParameters(UPDATE_PARAM_PREFERENCE); + } } @Override @@ -1743,6 +1758,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, setPreviewDisplay(mSurfaceHolder); setDisplayOrientation(); + mAeAwbLock = false; // Unlock AE and AWB. setCameraParameters(UPDATE_PARAM_ALL); // If the focus mode is continuous autofocus, call cancelAutoFocus to // resume it because it may have been paused by autoFocus call. @@ -1816,6 +1832,14 @@ public class Camera extends ActivityBase implements FocusManager.Listener, } private void updateCameraParametersPreference() { + if (mAeLockSupported) { + mParameters.setAutoExposureLock(mAeAwbLock); + } + + if (mAwbLockSupported) { + mParameters.setAutoWhiteBalanceLock(mAeAwbLock); + } + if (mFocusAreaSupported) { mParameters.setFocusAreas(mFocusManager.getFocusAreas()); } @@ -2213,5 +2237,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, && isSupported(Parameters.FOCUS_MODE_AUTO, mInitialParams.getSupportedFocusModes())); mMeteringAreaSupported = (mInitialParams.getMaxNumMeteringAreas() > 0); + mAeLockSupported = mInitialParams.isAutoExposureLockSupported(); + mAwbLockSupported = mInitialParams.isAutoWhiteBalanceLockSupported(); } } |