Make sure shutter button is inactive before the preview was started.

  Bug: 19285609

Change-Id: I7ef4cd5a80bdc151d743ece99aa1528ffe09ed20

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 872a262..0c47d0e 100644 (file)
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -562,6 +562,8 @@ public class CaptureModule extends CameraModule implements
 
     @Override
     public void resume() {
+        // We'll transition into 'ready' once the preview is started.
+        onReadyStateChanged(false);
         mPaused = false;
         mAppController.addPreviewAreaSizeChangedListener(mPreviewAreaChangedListener);
         mAppController.addPreviewAreaSizeChangedListener(mUI);