Camera: disable camera controls while burst mode is enabled

* Fix burst mode state detection
* Prevent swiping, hide camera controls during burst

Change-Id: Ia901091693b16d84a34a2faf880c8316d039cf50

1 files changed, 13 insertions, 4 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index cca9286e8..0b63b97dc 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -839,6 +839,10 @@ 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
@@ -1398,17 +1402,22 @@ public class PhotoModule
         if (seconds > 0) {
             mUI.startCountDown(seconds, playSound);
         } else {
+            mSnapshotOnIdle = false;
             mFocusManager.doSnap();
             mBurstShotsDone++;
 
             if (mBurstShotsDone == nbBurstShots) {
                 mBurstShotsDone = 0;
                 mBurstShotInProgress = false;
-                mSnapshotOnIdle = false;
-            } else if (mSnapshotOnIdle == false) {
-                // queue a new shot until we done all our shots
-                mSnapshotOnIdle = true;
+            } else if (nbBurstShots > 1) {
                 mBurstShotInProgress = true;
+                // do queue snapshot while previous is in progress, see above
+                mSnapshotOnIdle = true;
+            }
+
+            if (mBurstShotInProgress) {
+                mActivity.hideUI();
+                mActivity.setSwipingEnabled(false);
             }
         }
     }