diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-07-13 15:08:20 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:10:09 -0700 |
commit | 79d4e6b9896ae1ed12f252dd55cca7f733eda67d (patch) | |
tree | 5856bb22753aea125444429d7a3458098e99cdc8 | |
parent | 7d80bdb6ca1db08ecd29389ac7f263ecff6c5b70 (diff) | |
download | android_packages_apps_Snap-79d4e6b9896ae1ed12f252dd55cca7f733eda67d.tar.gz android_packages_apps_Snap-79d4e6b9896ae1ed12f252dd55cca7f733eda67d.tar.bz2 android_packages_apps_Snap-79d4e6b9896ae1ed12f252dd55cca7f733eda67d.zip |
SnapdragonCamera: Shutter sound menu
Shutter sound menu to choose on/off
Change-Id: Id5ea22a837cd658c3278160a21c74b519f1bc212
CRs-Fixed: 1050663
-rw-r--r-- | res/drawable-hdpi/ic_settings_shuttersound.png | bin | 0 -> 3581 bytes | |||
-rw-r--r-- | res/values/qcomarrays.xml | 9 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 5 | ||||
-rw-r--r-- | res/xml/camera_preferences.xml | 7 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 1 | ||||
-rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 22 |
7 files changed, 43 insertions, 5 deletions
diff --git a/res/drawable-hdpi/ic_settings_shuttersound.png b/res/drawable-hdpi/ic_settings_shuttersound.png Binary files differnew file mode 100644 index 000000000..ba1e42321 --- /dev/null +++ b/res/drawable-hdpi/ic_settings_shuttersound.png diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 4858ab3c0..5a7f7a309 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -597,6 +597,15 @@ <item>enable</item> </string-array> + <string-array name="pref_camera_shuttersound_entries" translatable="false"> + <item>@string/pref_camera_shuttersound_entry_disable</item> + <item>@string/pref_camera_shuttersound_entry_enable</item> + </string-array> + <string-array name="pref_camera_shuttersound_entryvalues" translatable="false"> + <item>disable</item> + <item>enable</item> + </string-array> + <!-- Camera Preferences Selectable Zone AF dialog box entries --> <string-array name="pref_camera_selectablezoneaf_entries" translatable="false"> <item>@string/pref_camera_selectablezoneaf_entry_auto</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index e03a47344..f8f1f1963 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -328,6 +328,11 @@ <string name="pref_camera_selfiemirror_entry_enable">Enable</string> <string name="pref_camera_selfiemirror_entry_disable">Disable</string> + <string name="pref_camera_shuttersound_default" translatable="false">enable</string> + <string name="pref_camera_shuttersound_title" translatable="true">Shutter Sound</string> + <string name="pref_camera_shuttersound_entry_enable">Enable</string> + <string name="pref_camera_shuttersound_entry_disable">Disable</string> + <!-- Default mce setting. Do not translate. --> <string name="pref_camera_mce_default">enable</string> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 9c6d64670..742c09d33 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -292,6 +292,13 @@ camera:entries="@array/pref_camera_selfiemirror_entries" camera:singleIcon="@drawable/ic_settings_selfiemirror" camera:entryValues="@array/pref_camera_selfiemirror_entryvalues" /> + <IconListPreference + camera:key="pref_camera_shuttersound_key" + camera:defaultValue="@string/pref_camera_shuttersound_default" + camera:title="@string/pref_camera_shuttersound_title" + camera:entries="@array/pref_camera_shuttersound_entries" + camera:singleIcon="@drawable/ic_settings_shuttersound" + camera:entryValues="@array/pref_camera_shuttersound_entryvalues" /> <ListPreference camera:key="pref_camera_selectablezoneaf_key" camera:defaultValue="@string/pref_camera_selectablezoneaf_default" diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index bf31724df..b09d147bf 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -101,6 +101,7 @@ public class CameraSettings { public static final String KEY_BRIGHTNESS = "pref_camera_brightness_key"; public static final String KEY_REDEYE_REDUCTION = "pref_camera_redeyereduction_key"; public static final String KEY_SELFIE_MIRROR = "pref_camera_selfiemirror_key"; + public static final String KEY_SHUTTER_SOUND = "pref_camera_shuttersound_key"; public static final String KEY_CDS_MODE = "pref_camera_cds_mode_key"; public static final String KEY_VIDEO_CDS_MODE = "pref_camera_video_cds_mode_key"; public static final String KEY_TNR_MODE = "pref_camera_tnr_mode_key"; diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 2c339f68b..6d1be0eff 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -192,7 +192,8 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_QC_CHROMA_FLASH, CameraSettings.KEY_REDEYE_REDUCTION, - CameraSettings.KEY_SELFIE_MIRROR + CameraSettings.KEY_SELFIE_MIRROR, + CameraSettings.KEY_SHUTTER_SOUND }; mOtherKeys2 = new String[] { @@ -236,6 +237,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_MANUAL_WB, CameraSettings.KEY_MANUAL_FOCUS, CameraSettings.KEY_SELFIE_MIRROR, + CameraSettings.KEY_SHUTTER_SOUND, SettingsManager.KEY_CAMERA2 }; 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); } } |