diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-09 01:17:49 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:40 +0200 |
| commit | 70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0 (patch) | |
| tree | 8d0f47b3f48e10b5f7c59b5d4497dd046117eb70 /src/com/android/camera/PhotoModule.java | |
| parent | aa0ed8c3c2985f1f2efcc1d40717c18f509cfb5c (diff) | |
| download | android_packages_apps_Snap-70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0.tar.gz android_packages_apps_Snap-70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0.tar.bz2 android_packages_apps_Snap-70c38b4bf5d5b16a6a8eee07b975ac321bd4f5a0.zip | |
snap: Better capture animation
* Modified version from Camera2
* Also adjust the callbacks for better response
Change-Id: I85ac23cdf35d9e2625799dd64b9f86aef103be7b
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d6f23e320..8085c40d6 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1656,7 +1656,7 @@ public class PhotoModule // i.e. If monkey/a user swipes to the gallery during picture taking, // don't show animation if (!mIsImageCaptureIntent) { - mUI.animateFlash(); + mUI.animateFlash(mFocusManager.isZslEnabled()); } } @@ -1674,7 +1674,9 @@ public class PhotoModule mPostViewPictureCallbackTime = 0; mJpegImageData = null; - final boolean animateBefore = (mSceneMode == CameraUtil.SCENE_MODE_HDR); + final boolean animateBefore = (mSceneMode == CameraUtil.SCENE_MODE_HDR) || + (mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL); + if(mHistogramEnabled) { if (mSnapshotMode != CameraInfo.CAMERA_SUPPORT_MODE_ZSL) { mHistogramEnabled = false; @@ -1689,7 +1691,12 @@ public class PhotoModule } if (animateBefore) { - animateAfterShutter(); + mActivity.runOnUiThread(new Runnable() { + @Override + public void run() { + animateAfterShutter(); + } + }); } if (mCameraState == LONGSHOT) { |