diff options
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 52e99ad1c..7c0db7c74 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1718,7 +1718,12 @@ public class PhotoModule new JpegPictureCallback(loc)); } } else { - mCameraDevice.enableShutterSound(!mRefocus); + if (!isShutterSoundOn()) { + mCameraDevice.enableShutterSound(false); + } else { + mCameraDevice.enableShutterSound(!mRefocus); + } + mCameraDevice.takePicture(mHandler, new ShutterCallback(!animateBefore), mRawPictureCallback, mPostViewPictureCallback, @@ -2325,14 +2330,23 @@ public class PhotoModule String zsl = mPreferences.getString(CameraSettings.KEY_ZSL, mActivity.getString(R.string.pref_camera_zsl_default)); mUI.overrideSettings(CameraSettings.KEY_ZSL, zsl); - mUI.startCountDown(seconds, playSound); - + mUI.startCountDown(seconds, isShutterSoundOn()); } else { mSnapshotOnIdle = false; initiateSnap(); } } + private boolean isShutterSoundOn() { + IconListPreference shutterSoundPref = (IconListPreference) mPreferenceGroup + .findPreference(CameraSettings.KEY_SHUTTER_SOUND); + if (shutterSoundPref != null && shutterSoundPref.getValue() != null && + shutterSoundPref.getValue().equalsIgnoreCase("disable")) { + return false; + } + return true; + } + private void initiateSnap() { if(mPreferences.getString(CameraSettings.KEY_SELFIE_FLASH, @@ -3039,7 +3053,7 @@ public class PhotoModule mParameters.set(CameraSettings.KEY_QC_MULTI_TOUCH_FOCUS, multiTouchFocus); } if (CameraUtil.isSupported(stillMore, - CameraSettings.getSupportedStillMoreModes(mParameters))) { + CameraSettings.getSupportedStillMoreModes(mParameters))) { mParameters.set(CameraSettings.KEY_QC_STILL_MORE, stillMore); } } |