Enable mode options when capture is done.

  Bug: 17260403

Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index da850ad..6b2e98b 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -500,6 +500,7 @@
         getServices().getRemoteShutterListener().onModuleReady(this);
         // TODO: Check if we can really take a photo right now (memory, camera
         // state, ... ).
+        mAppController.getCameraAppUI().enableModeOptions();
         mAppController.setShutterEnabled(true);
     }
 
@@ -709,6 +710,9 @@
 
     @Override
     public void onReadyStateChanged(boolean readyForCapture) {
+        if (readyForCapture) {
+            mAppController.getCameraAppUI().enableModeOptions();
+        }
         mAppController.setShutterEnabled(readyForCapture);
     }
 
@@ -725,6 +729,8 @@
 
     @Override
     public void onPictureTaken(CaptureSession session) {
+        mAppController.getCameraAppUI().enableModeOptions();
+        mAppController.getCameraAppUI().setShutterButtonEnabled(true);
     }
 
     @Override