Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad

2 files changed, 7 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,
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index a29630f81..ea0037db2 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -629,6 +629,9 @@ public class PhotoUI implements PieListener,
         return mShutterButton.isPressed();
     }
 
+    /**
+     * Enables or disables the shutter button.
+     */
     public void enableShutter(boolean enabled) {
         if (mShutterButton != null) {
             mShutterButton.setEnabled(enabled);