Merge "SnapdragonCamera: show how many more pictures can be taken"

3 files changed, 87 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 14e80ceb2..f181fa0e3 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -357,6 +357,8 @@ public class PhotoModule
     private static final int MANUAL_EXPOSURE = 4;
     private boolean mAnimateCapture = true;
 
+    private int mJpegFileSizeEstimation = 0;
+
     private MediaSaveService.OnMediaSavedListener mOnMediaSavedListener =
             new MediaSaveService.OnMediaSavedListener() {
                 @Override
@@ -1319,6 +1321,7 @@ public class PhotoModule
                     // the mean time and fill it, but that could have happened between the
                     // shutter press and saving the JPEG too.
                     mActivity.updateStorageSpaceAndHint();
+                    updateRemainingPhotos();
                     long now = System.currentTimeMillis();
                     mJpegCallbackFinishTime = now - mJpegPictureCallbackTime;
                     Log.v(TAG, "mJpegCallbackFinishTime = "
@@ -2207,10 +2210,20 @@ public class PhotoModule
             @Override
             public void run(){
                 mActivity.updateStorageSpaceAndHint();
+                updateRemainingPhotos();
             }
         });
     }
 
+    private void updateRemainingPhotos() {
+        if (mJpegFileSizeEstimation != 0) {
+            mUI.updateRemainingPhotos((int) (mActivity.getStorageSpaceBytes()
+                    / mJpegFileSizeEstimation));
+        } else {
+            mUI.updateRemainingPhotos(-1);
+        }
+    }
+
     private void onResumeTasks() {
         Log.v(TAG, "Executing onResumeTasks.");
         if (mOpenCameraFail || mCameraDisabled) return;
@@ -2808,6 +2821,7 @@ public class PhotoModule
                 //mUnsupportedJpegQuality = true;
             }else {
                 mParameters.setJpegQuality(JpegEncodingQualityMappings.getQualityNumber(jpegQuality));
+                setJpegFileSizeEstimation(pic_size, jpegQuality);
             }
         }
 
@@ -3205,6 +3219,25 @@ public class PhotoModule
         }
     }
 
+    private void setJpegFileSizeEstimation(final Size size, final String quality) {
+        int[] ratios = mActivity.getResources().getIntArray(R.array.jpegquality_compression_ratio);
+        String[] qualities = mActivity.getResources().getStringArray(
+                R.array.pref_camera_jpegquality_entryvalues);
+        int ratio = 0;
+        for (int i = ratios.length - 1; i >= 0; --i) {
+            if (qualities[i].equals(quality)) {
+                ratio = ratios[i];
+                break;
+            }
+        }
+
+        if (ratio == 0) {
+            mJpegFileSizeEstimation = 0;
+        } else {
+            mJpegFileSizeEstimation = size.width * size.height * 3 / ratio;
+        }
+    }
+
     private void setFlipValue() {
         // Read Flip mode from adb command
         //value: 0(default) - FLIP_MODE_OFF
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 48fb2f704..eb55b72be 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -1159,4 +1159,7 @@ public class PhotoUI implements PieListener,
         mMenu.setPreference(key, value);
     }
 
+    public void updateRemainingPhotos(int remaining) {
+        mCameraControls.updateRemainingPhotos(remaining);
+    }
 }
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 1c9419569..181bd991e 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -26,6 +26,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 import java.util.ArrayList;
 
 import org.codeaurora.snapcam.R;
@@ -66,6 +67,8 @@ public class CameraControls extends RotatableLayout {
     private boolean[] mTempEnabled = new boolean[9];
     private boolean mLocSet = false;
 
+    private TextView mRemainingPhotos;
+
     AnimatorListener outlistener = new AnimatorListener() {
         @Override
         public void onAnimationStart(Animator animation) {
@@ -205,6 +208,7 @@ public class CameraControls extends RotatableLayout {
         mPreview = findViewById(R.id.preview_thumb);
         mSceneModeSwitcher = findViewById(R.id.scene_mode_switcher);
         mFilterModeSwitcher = findViewById(R.id.filter_mode_switcher);
+        mRemainingPhotos = (TextView) findViewById(R.id.remaining_photos);
     }
 
     @Override
@@ -238,6 +242,8 @@ public class CameraControls extends RotatableLayout {
             View done = findViewById(R.id.btn_done);
             toRight(done, shutter, rotation);
         }
+
+        layoutRemaingPhotos();
     }
 
     private void setLocation(int w, int h) {
@@ -388,6 +394,7 @@ public class CameraControls extends RotatableLayout {
                 mPreview.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
                 break;
         }
+        mRemainingPhotos.setVisibility(View.INVISIBLE);
     }
 
     public void showUI() {
@@ -475,6 +482,9 @@ public class CameraControls extends RotatableLayout {
                 mPreview.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
                 break;
         }
+        if (mRemainingPhotos.getVisibility() == View.INVISIBLE) {
+            mRemainingPhotos.setVisibility(View.VISIBLE);
+        }
     }
 
     private void center(View v, Rect other, int rotation) {
@@ -646,4 +656,45 @@ public class CameraControls extends RotatableLayout {
         mBackgroundView.setBackgroundResource(R.drawable.switcher_bg);
     }
 
+    private void layoutRemaingPhotos() {
+        int rl = mPreview.getLeft();
+        int rt = mPreview.getTop();
+        int rr = mPreview.getRight();
+        int rb = mPreview.getBottom();
+        int w = mRemainingPhotos.getMeasuredWidth();
+        int h = mRemainingPhotos.getMeasuredHeight();
+        int m = getResources().getDimensionPixelSize(R.dimen.remaining_photos_margin);
+
+        int hc, vc;
+        int rotation = getUnifiedRotation();
+        switch (rotation) {
+            case 90:
+                hc = (rl + rr) / 2 - m;
+                vc = (rt + rb) / 2;
+                break;
+            case 180:
+                hc = (rl + rr) / 2;
+                vc = (rt + rb) / 2 + m;
+                break;
+            case 270:
+                hc = (rl + rr) / 2 + m;
+                vc = (rt + rb) / 2;
+                break;
+            default:
+                hc = (rl + rr) / 2;
+                vc = (rt + rb) / 2 - m;
+                break;
+        }
+        mRemainingPhotos.layout(hc - w / 2, vc - h / 2, hc + w / 2, vc + h / 2);
+    }
+
+    public void updateRemainingPhotos(int remaining) {
+        if (remaining < 0) {
+            mRemainingPhotos.setVisibility(View.GONE);
+        } else {
+            mRemainingPhotos.setVisibility(View.VISIBLE);
+            mRemainingPhotos.setText(String.format(
+                    getResources().getString(R.string.remaining_photos_format), remaining));
+        }
+    }
 }