diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-10-05 10:15:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-10-05 10:15:19 +0000 |
| commit | 19722096420dcb74558fb45a817be6b73d78ac14 (patch) | |
| tree | 9de2e56220cb37d3f70258af6a5d00af8f9fe167 | |
| parent | c783a5671304a538a2747db8f5b3b24105b2d43b (diff) | |
| parent | 445732cd2f0cd193781cc35ed38e606d6e3c8724 (diff) | |
| download | android_packages_apps_Gallery2-19722096420dcb74558fb45a817be6b73d78ac14.tar.gz android_packages_apps_Gallery2-19722096420dcb74558fb45a817be6b73d78ac14.tar.bz2 android_packages_apps_Gallery2-19722096420dcb74558fb45a817be6b73d78ac14.zip | |
Merge "Revert "camera: improve snapshot KPI"" into cm-10.2
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index bd68b0aed..ca438ca9d 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 = |