commit 2dcc0a9dfcc23f090bbe36308f92d72f68c4f0a2
author Angus Kong <shkong@google.com> Wed Sep 25 13:00:08 2013 -0700
committer Angus Kong <shkong@google.com> Wed Sep 25 14:06:32 2013 -0700
tree d589b18a2e9cc30183ed90bc47e54f85fdaf72ae
parent b998a491a5b24e710bc1711dbb00cbfa05273bf2

Checks for low storage in wide-angle pano mode.

1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE.
2. Checks for low storage before start preview in wide-angle pano mode.
3. Add low storage warning message for debugging when in wide-angle pano mode.

  bug:10691367

Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 98b52dd..13a5adf 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -76,7 +76,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
@@ -1095,9 +1094,9 @@
                 || (mCameraState == PREVIEW_STOPPED)) return;
 
         // Do not take the picture if there is not enough storage.
-        if (mActivity.getStorageSpace() <= Storage.LOW_STORAGE_THRESHOLD) {
+        if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
             Log.i(TAG, "Not enough space or storage not ready. remaining="
-                    + mActivity.getStorageSpace());
+                    + mActivity.getStorageSpaceBytes());
             return;
         }
         Log.v(TAG, "onShutterButtonClick: mCameraState=" + mCameraState);
@@ -1350,7 +1349,7 @@
     }
 
     private boolean canTakePicture() {
-        return isCameraIdle() && (mActivity.getStorageSpace() > Storage.LOW_STORAGE_THRESHOLD);
+        return isCameraIdle() && (mActivity.getStorageSpaceBytes() > Storage.LOW_STORAGE_THRESHOLD_BYTES);
     }
 
     @Override