commit 17c7f57c5381be3e72ba090d7b74b3331a19c2f0
author Steve Kondik <shade@chemlab.org> Sat Oct 05 10:15:10 2013 +0000
committer akellar <apkellar@gmail.com> Sun Oct 06 17:29:59 2013 -0500
tree 4ece3bb43d4f830adedc486d46cc4bf498f183a6
parent e1bbe365456e2b875e00ea2498b66958ff76280a

Revert "camera: improve snapshot KPI"

This reverts commit 1a0e156ed8e9fb80e4fdd5160d710fe7775f0516.

Change-Id: Ie02a04f60af4d6896057890ef81fa058494605e8

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 282ada0..716fc67 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -784,14 +784,6 @@
             mRawPictureCallbackTime = System.currentTimeMillis();
             Log.v(TAG, "mShutterToRawCallbackTime = "
                     + (mRawPictureCallbackTime - mShutterCallbackTime) + "ms");
-            if (ApiHelper.HAS_SURFACE_TEXTURE && !mIsImageCaptureIntent
-                    && mActivity.mShowCameraAppView) {
-                // Finish capture animation
-                mHandler.removeMessages(CAPTURE_ANIMATION_DONE);
-                ((CameraScreenNail) mActivity.mCameraScreenNail).animateSlide();
-                mHandler.sendEmptyMessageDelayed(CAPTURE_ANIMATION_DONE,
-                        CaptureAnimManager.getAnimationDuration());
-            }
         }
     }
 
@@ -834,6 +826,14 @@
             // Only animate when in full screen capture mode
             // i.e. If monkey/a user swipes to the gallery during picture taking,
             // don't show animation
+            if (ApiHelper.HAS_SURFACE_TEXTURE && !mIsImageCaptureIntent
+                    && mActivity.mShowCameraAppView) {
+                // Finish capture animation
+                mHandler.removeMessages(CAPTURE_ANIMATION_DONE);
+                ((CameraScreenNail) mActivity.mCameraScreenNail).animateSlide();
+                mHandler.sendEmptyMessageDelayed(CAPTURE_ANIMATION_DONE,
+                        CaptureAnimManager.getAnimationDuration());
+            }
             mFocusManager.updateFocusUI(); // Ensure focus indicator is hidden.
 
             boolean isSamsungHDR =