From 69d1c4dfde72a717cd977ca69fe1cd17f8817087 Mon Sep 17 00:00:00 2001 From: Camera Software Integration Date: Tue, 10 Nov 2015 13:19:41 -0800 Subject: SnapdragonCamera: Do not update panorama thumbnail when cancelled Do not update thumbnail when panorama is cancelled. Change-Id: I3db9f9614b35ee4e475fbb7b1dc801b77e6ed6bd CRs-Fixed: 934157 --- src/com/android/camera/WideAnglePanoramaUI.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/com/android/camera/WideAnglePanoramaUI.java') 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( -- cgit v1.2.3