diff options
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 7 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 5f74adcf1..e3856600a 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -315,7 +315,7 @@ public class WideAnglePanoramaModule switch (msg.what) { case MSG_LOW_RES_FINAL_MOSAIC_READY: onBackgroundThreadFinished(); - showFinalMosaic((Bitmap) msg.obj); + saveFinalMosaic((Bitmap) msg.obj); saveHighResMosaic(); break; case MSG_GENERATE_FINAL_MOSAIC_ERROR: @@ -757,6 +757,7 @@ public class WideAnglePanoramaModule mActivity.runOnUiThread(new Runnable() { @Override public void run() { + mUI.showFinalMosaic(); mActivity.notifyNewMedia(uri); } }); @@ -815,8 +816,8 @@ public class WideAnglePanoramaModule } } - private void showFinalMosaic(Bitmap bitmap) { - mUI.showFinalMosaic(bitmap, getCaptureOrientation()); + private void saveFinalMosaic(Bitmap bitmap) { + mUI.saveFinalMosaic(bitmap, getCaptureOrientation()); } private Uri savePanorama(byte[] jpegData, int width, int height, int orientation) { diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 37a476f48..e0d82f2e2 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -88,6 +88,7 @@ public class WideAnglePanoramaUI implements private ShutterButton mShutterButton; private CameraControls mCameraControls; private ImageView mThumbnail; + private Bitmap mThumbnailBitmap; private Matrix mProgressDirectionMatrix = new Matrix(); private float[] mProgressAngle = new float[2]; @@ -303,7 +304,7 @@ public class WideAnglePanoramaUI implements mCaptureProgressBar.setVisibility(View.INVISIBLE); } - public void showFinalMosaic(Bitmap bitmap, int orientation) { + public void saveFinalMosaic(Bitmap bitmap, int orientation) { if (bitmap != null && orientation != 0) { Matrix rotateMatrix = new Matrix(); rotateMatrix.setRotate(orientation); @@ -320,7 +321,14 @@ public class WideAnglePanoramaUI implements // a framework bug. Call requestLayout() as a workaround. mSavingProgressBar.requestLayout(); - mActivity.updateThumbnail(bitmap); + mThumbnailBitmap = bitmap; + } + + public void showFinalMosaic() { + if (mThumbnailBitmap == null) return; + mActivity.updateThumbnail(mThumbnailBitmap); + mThumbnailBitmap.recycle(); + mThumbnailBitmap = null; } public void onConfigurationChanged( |