Disable shutter button while picture is being taken.

  Bug: 7328018

Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38

2 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index f56bd68f0..df9b667af 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -676,6 +676,7 @@ public class PhotoModule
 
         @Override
         public void onPictureTaken(final byte [] jpegData, CameraProxy camera) {
+            mUI.enableShutter(true);
             if (mPaused) {
                 return;
             }
@@ -894,6 +895,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 7adb27f90..a2f58155c 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -623,6 +623,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);