Merge "SnapdragonCamera: Update the preview thumbnail after continuous shot"

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 6ea6b5c8e..9c3cd4858 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -250,6 +250,9 @@ public class PhotoModule
     private SoundPool mSoundPool;
     private int mRefocusSound;
 
+    private byte[] mLastJpegData;
+    private int mLastJpegOrientation = 0;
+
     private Runnable mDoSnapRunnable = new Runnable() {
         @Override
         public void run() {
@@ -1314,7 +1317,14 @@ public class PhotoModule
                             if (mAnimateCapture) {
                                 mUI.animateCapture(jpegData, orientation, mMirror);
                             }
+                        } else {
+                            // In long shot mode, we do not want to update the preview thumbnail
+                            // for each snapshot, instead, keep the last jpeg data and orientation,
+                            // use it to show the final one at the end of long shot.
+                            mLastJpegData = jpegData;
+                            mLastJpegOrientation = orientation;
                         }
+
                     } else {
                         mJpegImageData = jpegData;
                         if (!mQuickCapture) {
@@ -2012,6 +2022,7 @@ public class PhotoModule
            if (mCameraState == LONGSHOT) {
                mLongshotActive = false;
                mCameraDevice.setLongshot(false);
+               mUI.animateCapture(mLastJpegData, mLastJpegOrientation, mMirror);
                if (!mFocusManager.isZslEnabled()) {
                    setupPreview();
                } else {