Merge "SnapdragonCamera: Add shutter animation for APP-ZSL mode" into camera-SnapdragonCamera.lnx.2.0

2 files changed, 17 insertions, 0 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 3ea667626..a16b769a7 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2337,6 +2337,12 @@ public class CaptureModule implements CameraModule, PhotoController,
         }
     }
 
+    public void doShutterAnimation() {
+        if (mUI != null) {
+            mUI.doShutterAnimation();
+        }
+    }
+
     private CameraCaptureSession.CaptureCallback mLongshotCallBack= new CameraCaptureSession.CaptureCallback() {
             @Override
             public void onCaptureCompleted(CameraCaptureSession session,
@@ -2750,6 +2756,7 @@ public class CaptureModule implements CameraModule, PhotoController,
                                 if (mLongshoting && (!mLongshotActive) &&
                                         image.getTimestamp() > mLastLongshotTimestamp) {
                                     image.close();
+                                    Log.d(TAG, "image duplicate mLastLongshotTimestamp ");
                                     return;
                                 }
                                 if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index e3d1c62a7..fe9f1c9d9 100755
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -587,6 +587,16 @@ public class PostProcessor{
                                                    CaptureRequest request,
                                                    TotalCaptureResult result) {
                         Log.d(TAG, "reprocessImage onCaptureCompleted");
+                        if (mActivity != null) {
+                            mActivity.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    if (mController != null) {
+                                        mController.doShutterAnimation();
+                                    }
+                                }
+                            });
+                        }
                     }
 
                     @Override