From 445732cd2f0cd193781cc35ed38e606d6e3c8724 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sat, 5 Oct 2013 10:15:10 +0000 Subject: Revert "camera: improve snapshot KPI" This reverts commit 1a0e156ed8e9fb80e4fdd5160d710fe7775f0516. Change-Id: Ie02a04f60af4d6896057890ef81fa058494605e8 --- src/com/android/camera/PhotoModule.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 4152ced39..83a67a666 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -784,14 +784,6 @@ public class PhotoModule 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 @@ public class PhotoModule // 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 = -- cgit v1.2.3