diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-26 11:52:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-26 11:52:04 -0700 |
| commit | 9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6 (patch) | |
| tree | 28fe15178cee501bb8f225a1076d8f342cd8edc7 /src/com/android/camera/PhotoModule.java | |
| parent | 22bd9b8fba0f10c4d07bbf2f4e9dc21035973798 (diff) | |
| parent | b7f6db492989eba63b9fa24fc8b7efac4068711e (diff) | |
| download | android_packages_apps_Snap-9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6.tar.gz android_packages_apps_Snap-9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6.tar.bz2 android_packages_apps_Snap-9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6.zip | |
Merge changes I868c8584,I398ed793,I88c592f7,I9c81a8ae into camera.lnx.1.0-dev.1.0
* changes:
SnapdragonCamera: Changing icon size
SnapdragonCamera: Mono preview visibility change on pause
SnapdragonCamera: ShutterSound control to cover long shot
SnapdragonCamera: Fix for false Selfie mirror preview
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 0616023c0..30f67a327 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1469,7 +1469,7 @@ public class PhotoModule mUI.setDownFactor(4); } if (mAnimateCapture) { - mUI.animateCapture(jpegData, orientation, mMirror); + mUI.animateCapture(jpegData); } } else { // In long shot mode, we do not want to update the preview thumbnail @@ -1483,7 +1483,7 @@ public class PhotoModule stopPreview(); mJpegImageData = jpegData; if (!mQuickCapture) { - mUI.showCapturedImageForReview(jpegData, orientation, mMirror); + mUI.showCapturedImageForReview(jpegData, orientation, false); } else { onCaptureDone(); } @@ -1708,6 +1708,12 @@ public class PhotoModule mUI.enableShutter(false); } + if (!isShutterSoundOn()) { + mCameraDevice.enableShutterSound(false); + } else { + mCameraDevice.enableShutterSound(!mRefocus); + } + if (mCameraState == LONGSHOT) { mLongShotCaptureCountLimit = SystemProperties.getInt( "persist.camera.longshot.shotnum", 0); @@ -1724,12 +1730,6 @@ public class PhotoModule new JpegPictureCallback(loc)); } } else { - if (!isShutterSoundOn()) { - mCameraDevice.enableShutterSound(false); - } else { - mCameraDevice.enableShutterSound(!mRefocus); - } - mCameraDevice.takePicture(mHandler, new ShutterCallback(!animateBefore), mRawPictureCallback, mPostViewPictureCallback, @@ -2245,7 +2245,7 @@ public class PhotoModule if (mCameraState == LONGSHOT) { mLongshotActive = false; mCameraDevice.setLongshot(false); - mUI.animateCapture(mLastJpegData, mLastJpegOrientation, mMirror); + mUI.animateCapture(mLastJpegData); mLastJpegData = null; if (!mFocusManager.isZslEnabled()) { setupPreview(); |