Merge "SnapdragonCamera: Fix mRemainingPhotos show error issue" into camera.lnx.3.0-dev

3 files changed, 26 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index d1bf95ff4..4c4525b79 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3238,7 +3238,19 @@ public class PhotoModule
         else{
             if("100".equals(jpegQuality) && (pic_size.width >= 3200)){
                 //mUnsupportedJpegQuality = true;
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mUI.hideRemainingPhotoCnt();
+                    }
+                });
             }else {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mUI.showRemainingPhotoCnt();
+                    }
+                });
                 mParameters.setJpegQuality(JpegEncodingQualityMappings.getQualityNumber(jpegQuality));
                 int jpegFileSize = estimateJpegFileSize(pic_size, jpegQuality);
                 if (jpegFileSize != mJpegFileSizeEstimation) {
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 50b5f64fe..ef0d827b8 100755..100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -617,6 +617,14 @@ public class PhotoUI implements PieListener,
         }
     }
 
+    public void hideRemainingPhotoCnt() {
+        mCameraControls.hideRemainingPhotoCnt();
+    }
+
+    public void showRemainingPhotoCnt() {
+        mCameraControls.showRemainingPhotoCnt();
+    }
+
     public void hideUI() {
         mSwitcher.closePopup();
         if (mUIhidden)
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index b85d7f1ca..2a2222804 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -1067,6 +1067,12 @@ public class CameraControls extends RotatableLayout {
         mRemainingPhotosText.setVisibility(View.GONE);
     }
 
+    public void showRemainingPhotoCnt() {
+        mHideRemainingPhoto = false;
+        mRemainingPhotos.setVisibility(View.VISIBLE);
+        mRemainingPhotosText.setVisibility(View.VISIBLE);
+    }
+
     private class ArrowTextView extends TextView {
         private static final int TEXT_SIZE = 14;
         private static final int PADDING_SIZE = 18;