am c4534909: New shutter retake assets
* commit 'c4534909cd5aee636edeef852a87b9eb36f5cc4a':
New shutter retake assets
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index d465bf7..0442c09 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -326,12 +326,6 @@
});
}
- @Override
- public void onStart() {
- super.onStart();
- updateThumbnailButton();
- }
-
private void setupCamera() {
openCamera();
Parameters parameters = mCameraDevice.getParameters();
@@ -751,6 +745,14 @@
t.start();
}
+ private void initThumbnailButton() {
+ // Load the thumbnail from the disk.
+ if (mThumbnail == null) {
+ mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME));
+ }
+ updateThumbnailButton();
+ }
+
private void updateThumbnailButton() {
// Update last image if URI is invalid and the storage is ready.
ContentResolver contentResolver = getContentResolver();
@@ -936,6 +938,8 @@
// has to be decided by camera device.
initMosaicFrameProcessorIfNeeded();
mMosaicView.onResume();
+
+ initThumbnailButton();
}
private void updateCompassValue() {
