Merge "Lock AE and AWB before autofocus starts." into ics-factoryrom

1 files changed, 17 insertions, 0 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 26d4497..970d98e 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -120,6 +120,9 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
     private Parameters mInitialParams;
     private boolean mFocusAreaSupported;
     private boolean mMeteringAreaSupported;
+    private boolean mAwbLockSupported;
+    private boolean mAeLockSupported;
+    private boolean mAeAwbLock;
 
     private MyOrientationEventListener mOrientationListener;
     // The degrees of the device rotated clockwise from its natural orientation.
@@ -1417,6 +1420,9 @@ 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;
+        setCameraParameters(UPDATE_PARAM_PREFERENCE);
         mFocusManager.doFocus(pressed);
     }
 
@@ -1519,6 +1525,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         if (mFaceView != null) {
             mFaceView.setDisplayOrientation(mDisplayOrientation);
         }
+        mAeAwbLock = false; // Always unlock AE and AWB before start.
         setCameraParameters(UPDATE_PARAM_ALL);
 
         try {
@@ -1568,6 +1575,14 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
     }
 
     private void updateCameraParametersPreference() {
+        if (mAwbLockSupported) {
+            mParameters.setAutoWhiteBalanceLock(mAeAwbLock);
+        }
+
+        if (mAeLockSupported) {
+            mParameters.setAutoExposureLock(mAeAwbLock);
+        }
+
         if (mFocusAreaSupported) {
             mParameters.setFocusAreas(mFocusManager.getTapArea());
         }
@@ -1972,5 +1987,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
                 && isSupported(Parameters.FOCUS_MODE_AUTO,
                         mInitialParams.getSupportedFocusModes()));
         mMeteringAreaSupported = (mInitialParams.getMaxNumMeteringAreas() > 0);
+        mAwbLockSupported = mInitialParams.isAutoWhiteBalanceLockSupported();
+        mAeLockSupported = mInitialParams.isAutoExposureLockSupported();
     }
 }