am 90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake

* commit '90defd62b3d0eed8cf3906c7f8394fc9ad401759':
  disable shutter button when mode list is open

1 files changed, 19 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 44c418012..fe060bf30 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -237,6 +237,7 @@ public class CameraActivity extends Activity
     private LocalMediaObserver mLocalVideosObserver;
 
     private boolean mPendingDeletion = false;
+    private boolean mSavedShutterEnabledState = true;
 
     private CameraController mCameraController;
     private boolean mPaused;
@@ -1066,9 +1067,18 @@ public class CameraActivity extends Activity
         // TODO: implement this
     }
 
+    private void saveShutterEnabledState() {
+        mSavedShutterEnabledState = isShutterEnabled();
+    }
+
+    private void restoreShutterEnabledState() {
+        setShutterEnabled(mSavedShutterEnabledState);
+    }
+
     @Override
     public void setShutterEnabled(boolean enabled) {
         mCameraAppUI.setShutterButtonEnabled(enabled);
+        saveShutterEnabledState();
     }
 
     @Override
@@ -1318,6 +1328,15 @@ public class CameraActivity extends Activity
             @Override
             public void onVisibilityChanged(boolean visible) {
                 mModeListVisible = visible;
+                if (visible) {
+                    saveShutterEnabledState();
+                    // bypass own setShutterEnabled()
+                    // which will blow away whatever's stored in
+                    // mSavedShutterEnabledState
+                    mCameraAppUI.setShutterButtonEnabled(false);
+                } else {
+                    restoreShutterEnabledState();
+                }
                 updatePreviewVisibility();
             }
         });