Merge "bugfix 5388221 Last captured (photo, video, panorama) thumbnail disappears in panaromic mode"

1 files changed, 23 insertions, 3 deletions

diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 1bdb717..c2a9ff6 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -38,6 +38,7 @@ import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -71,6 +72,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.util.List;
 
 /**
@@ -268,9 +270,8 @@ public class PanoramaActivity extends ActivityBase implements
                         onBackgroundThreadFinished();
                         // Set the thumbnail bitmap here because mThumbnailView must be accessed
                         // from the UI thread.
-                        if (mThumbnail != null) {
-                            mThumbnailView.setBitmap(mThumbnail.getBitmap());
-                        }
+                        updateThumbnailButton();
+
                         // Share popup may still have the reference to the old thumbnail. Clear it.
                         mSharePopup = null;
                         resetToPreview();
@@ -306,6 +307,12 @@ public class PanoramaActivity extends ActivityBase implements
                 });
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        updateThumbnailButton();
+    }
+
     private void setupCamera() {
         openCamera();
         Parameters parameters = mCameraDevice.getParameters();
@@ -725,6 +732,19 @@ public class PanoramaActivity extends ActivityBase implements
         t.start();
     }
 
+    private void updateThumbnailButton() {
+        // Update last image if URI is invalid and the storage is ready.
+        ContentResolver contentResolver = getContentResolver();
+        if ((mThumbnail == null || !Util.isUriValid(mThumbnail.getUri(), contentResolver))) {
+            mThumbnail = Thumbnail.getLastThumbnail(contentResolver);
+        }
+        if (mThumbnail != null) {
+            mThumbnailView.setBitmap(mThumbnail.getBitmap());
+        } else {
+            mThumbnailView.setBitmap(null);
+        }
+    }
+
     public void saveHighResMosaic() {
         runBackgroundThread(new Thread() {
             @Override