Merge "Revert "camera: improve snapshot KPI"" into cm-10.2 (19722096) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/camera/PhotoModule.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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 =