summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-09 00:28:42 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-09 00:28:42 -0800
commit195a6043e2d4dc7229cfb5fb5c80021d35be2cfa (patch)
treeac34e95b6cf6f7e1a0207b90003c25a807e9f409 /src/com
parentcbd9bb85751ea5233f5c902a5b2baf8635d52a0b (diff)
parente21b0c20ab3133244eba71b383f54a257a6771c2 (diff)
downloadandroid_packages_apps_Snap-195a6043e2d4dc7229cfb5fb5c80021d35be2cfa.tar.gz
android_packages_apps_Snap-195a6043e2d4dc7229cfb5fb5c80021d35be2cfa.tar.bz2
android_packages_apps_Snap-195a6043e2d4dc7229cfb5fb5c80021d35be2cfa.zip
Merge "SnapdragonCamera: lock AE and AWB while taking panorama snapshot"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 5c45cae35..b612ee9e8 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -521,6 +521,10 @@ public class WideAnglePanoramaModule
mActivity.setSwipingEnabled(false);
mCaptureState = CAPTURE_STATE_MOSAIC;
mUI.onStartCapture();
+ Parameters parameters = mCameraDevice.getParameters();
+ parameters.setAutoExposureLock(true);
+ parameters.setAutoWhiteBalanceLock(true);
+ configureCamera(parameters);
mMosaicFrameProcessor.setProgressListener(new MosaicFrameProcessor.ProgressListener() {
@Override
@@ -562,6 +566,10 @@ public class WideAnglePanoramaModule
private void stopCapture(boolean aborted) {
mCaptureState = CAPTURE_STATE_VIEWFINDER;
mUI.onStopCapture();
+ Parameters parameters = mCameraDevice.getParameters();
+ parameters.setAutoExposureLock(false);
+ parameters.setAutoWhiteBalanceLock(false);
+ configureCamera(parameters);
mMosaicFrameProcessor.setProgressListener(null);
stopCameraPreview();