Revert "Camera: disable camera controls while burst mode is enabled"

* Burst mode state detection is difficult, this triggers a lot of edge
  cases where the camera will be in burst mode but be interrupted part
  way through, including the case where the camera HAL fails to finish a
  set of burst mode pictures.

This reverts commit a15045397950d07fa60b8342463ae336f8e98866.

Change-Id: I2201a20e4ebb58533ea9dfd1a7362f71dfc318c0

1 files changed, 4 insertions, 13 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 0b63b97dc..cca9286e8 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -839,10 +839,6 @@ public class PhotoModule
                 mActivity.showSwitcher();
                 mActivity.setSwipingEnabled(true);
             }
-            if (!mBurstShotInProgress) {
-                mActivity.showUI();
-                mActivity.setSwipingEnabled(true);
-            }
 
             mJpegPictureCallbackTime = System.currentTimeMillis();
             // If postview callback has arrived, the captured image is displayed
@@ -1402,22 +1398,17 @@ public class PhotoModule
         if (seconds > 0) {
             mUI.startCountDown(seconds, playSound);
         } else {
-            mSnapshotOnIdle = false;
             mFocusManager.doSnap();
             mBurstShotsDone++;
 
             if (mBurstShotsDone == nbBurstShots) {
                 mBurstShotsDone = 0;
                 mBurstShotInProgress = false;
-            } else if (nbBurstShots > 1) {
-                mBurstShotInProgress = true;
-                // do queue snapshot while previous is in progress, see above
+                mSnapshotOnIdle = false;
+            } else if (mSnapshotOnIdle == false) {
+                // queue a new shot until we done all our shots
                 mSnapshotOnIdle = true;
-            }
-
-            if (mBurstShotInProgress) {
-                mActivity.hideUI();
-                mActivity.setSwipingEnabled(false);
+                mBurstShotInProgress = true;
             }
         }
     }