summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index cdd27f148..8e03131c4 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -678,6 +678,7 @@ public class PhotoModule
@Override
public void onPictureTaken(final byte [] jpegData, CameraProxy camera) {
+ mUI.enableShutter(true);
if (mPaused) {
return;
}
@@ -896,6 +897,9 @@ public class PhotoModule
CameraUtil.setGpsParameters(mParameters, loc);
mCameraDevice.setParameters(mParameters);
+ // We don't want user to press the button again while taking a
+ // multi-second HDR photo.
+ mUI.enableShutter(false);
mCameraDevice.takePicture(mHandler,
new ShutterCallback(!animateBefore),
mRawPictureCallback, mPostViewPictureCallback,