diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-13 06:16:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-13 06:16:18 -0700 |
| commit | e2c6bdcd24425d811cf98b967a09a42449967f56 (patch) | |
| tree | d3b6908498c15d182485e82c2f1be878bf40422b | |
| parent | 27db0baf65149c98e51dbf75074b5f5120a289f1 (diff) | |
| parent | 5d121a6f7a3b06666f0db46745ff324a442960e6 (diff) | |
| download | android_packages_apps_Snap-e2c6bdcd24425d811cf98b967a09a42449967f56.tar.gz android_packages_apps_Snap-e2c6bdcd24425d811cf98b967a09a42449967f56.tar.bz2 android_packages_apps_Snap-e2c6bdcd24425d811cf98b967a09a42449967f56.zip | |
Merge "SnapdragonCamera: ShutterSound control to cover long shot" into camera.lnx.1.0.c7-dev
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 5d1099c01..0c41b7d91 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1702,6 +1702,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); @@ -1718,12 +1724,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, |