am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad

* commit 'c9c1504408819bda3fb6b2b264f9dbf6012f9b7f':
  Checks for low storage in wide-angle pano mode.

5 files changed, 30 insertions, 28 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 55b3dd7c5..5cf6bd6ae 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -151,7 +151,7 @@ public class CameraActivity extends Activity
     private int mResultCodeForTesting;
     private Intent mResultDataForTesting;
     private OnScreenHint mStorageHint;
-    private long mStorageSpace = Storage.LOW_STORAGE_THRESHOLD;
+    private long mStorageSpaceBytes = Storage.LOW_STORAGE_THRESHOLD_BYTES;
     private boolean mAutoRotateScreen;
     private boolean mSecureCamera;
     // This is a hack to speed up the start of SecureCamera.
@@ -1148,24 +1148,16 @@ public class CameraActivity extends Activity
     }
 
     protected void updateStorageSpace() {
-        mStorageSpace = Storage.getAvailableSpace();
+        mStorageSpaceBytes = Storage.getAvailableSpace();
     }
 
-    protected long getStorageSpace() {
-        return mStorageSpace;
+    protected long getStorageSpaceBytes() {
+        return mStorageSpaceBytes;
     }
 
     protected void updateStorageSpaceAndHint() {
         updateStorageSpace();
-        updateStorageHint(mStorageSpace);
-    }
-
-    protected void updateStorageHint() {
-        updateStorageHint(mStorageSpace);
-    }
-
-    protected boolean updateStorageHintOnResume() {
-        return true;
+        updateStorageHint(mStorageSpaceBytes);
     }
 
     protected void updateStorageHint(long storageSpace) {
@@ -1176,7 +1168,7 @@ public class CameraActivity extends Activity
             message = getString(R.string.preparing_sd);
         } else if (storageSpace == Storage.UNKNOWN_SIZE) {
             message = getString(R.string.access_sd_fail);
-        } else if (storageSpace <= Storage.LOW_STORAGE_THRESHOLD) {
+        } else if (storageSpace <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
             message = getString(R.string.spaceIsLow_content);
         }
 
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 33c9333cd..00a5f01a5 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -76,7 +76,6 @@ import java.io.FileNotFoundException;
 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 @@ public class PhotoModule
                 || (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 @@ public class PhotoModule
     }
 
     private boolean canTakePicture() {
-        return isCameraIdle() && (mActivity.getStorageSpace() > Storage.LOW_STORAGE_THRESHOLD);
+        return isCameraIdle() && (mActivity.getStorageSpaceBytes() > Storage.LOW_STORAGE_THRESHOLD_BYTES);
     }
 
     @Override
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 8aa3eca52..a8ce08b93 100644
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -51,7 +51,7 @@ public class Storage {
     public static final long UNAVAILABLE = -1L;
     public static final long PREPARING = -2L;
     public static final long UNKNOWN_SIZE = -3L;
-    public static final long LOW_STORAGE_THRESHOLD = 50000000;
+    public static final long LOW_STORAGE_THRESHOLD_BYTES = 50000000;
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private static void setImageSize(ContentValues values, int width, int height) {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index d6c88576d..b8b3fcf9d 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1001,7 +1001,7 @@ public class VideoModule implements CameraModule,
         }
 
         // Set maximum file size.
-        long maxFileSize = mActivity.getStorageSpace() - Storage.LOW_STORAGE_THRESHOLD;
+        long maxFileSize = mActivity.getStorageSpaceBytes() - Storage.LOW_STORAGE_THRESHOLD_BYTES;
         if (requestedSizeLimit > 0 && requestedSizeLimit < maxFileSize) {
             maxFileSize = requestedSizeLimit;
         }
@@ -1182,7 +1182,7 @@ public class VideoModule implements CameraModule,
         mUI.setSwipingEnabled(false);
 
         mActivity.updateStorageSpaceAndHint();
-        if (mActivity.getStorageSpace() <= Storage.LOW_STORAGE_THRESHOLD) {
+        if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
             Log.v(TAG, "Storage issue, ignore the start request");
             return;
         }
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 59c4350be..fb7137e20 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -573,18 +573,28 @@ public class WideAnglePanoramaModule
     public void onShutterButtonClick() {
         // If mCameraTexture == null then GL setup is not finished yet.
         // No buttons can be pressed.
-        if (mPaused || mThreadRunning || mCameraTexture == null) return;
+        if (mPaused || mThreadRunning || mCameraTexture == null) {
+            return;
+        }
         // Since this button will stay on the screen when capturing, we need to check the state
         // right now.
         switch (mCaptureState) {
             case CAPTURE_STATE_VIEWFINDER:
-                if(mActivity.getStorageSpace() <= Storage.LOW_STORAGE_THRESHOLD) return;
+                final long storageSpaceBytes = mActivity.getStorageSpaceBytes();
+                if(storageSpaceBytes <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
+                    Log.w(TAG, "Low storage warning: " + storageSpaceBytes);
+                    return;
+                }
                 mSoundPlayer.play(SoundClips.START_VIDEO_RECORDING);
                 startCapture();
                 break;
             case CAPTURE_STATE_MOSAIC:
                 mSoundPlayer.play(SoundClips.STOP_VIDEO_RECORDING);
                 stopCapture(false);
+                break;
+            default:
+                Log.w(TAG, "Unknown capture state: " + mCaptureState);
+                break;
         }
     }
 
@@ -696,11 +706,7 @@ public class WideAnglePanoramaModule
         mActivity.setSwipingEnabled(true);
         // Orientation change will trigger onLayoutChange->configMosaicPreview->
         // resetToPreview. Do not show the capture UI in film strip.
-        /* if (mActivity.mShowCameraAppView) {
-            mCaptureLayout.setVisibility(View.VISIBLE); */
         mUI.showPreviewUI();
-        /*} else {
-        }*/
         mMosaicFrameProcessor.reset();
     }
 
@@ -711,7 +717,9 @@ public class WideAnglePanoramaModule
             return;
         }
         reset();
-        if (!mPaused) startCameraPreview();
+        if (!mPaused) {
+            startCameraPreview();
+        }
     }
 
     private void showFinalMosaic(Bitmap bitmap) {
@@ -863,6 +871,7 @@ public class WideAnglePanoramaModule
             mPreviewUIWidth = size.x;
             mPreviewUIHeight = size.y;
             configMosaicPreview();
+            mActivity.updateStorageSpaceAndHint();
         }
         keepScreenOnAwhile();
 
@@ -1009,6 +1018,7 @@ public class WideAnglePanoramaModule
                     }
                 }
             }
+            mActivity.updateStorageSpace();
             return null;
         }
 
@@ -1023,6 +1033,7 @@ public class WideAnglePanoramaModule
             mPreviewUIHeight = size.y;
             configMosaicPreview();
             resetToPreviewIfPossible();
+            mActivity.updateStorageHint(mActivity.getStorageSpaceBytes());
         }
     }