summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-07-13 15:08:20 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-16 16:10:09 -0700
commit79d4e6b9896ae1ed12f252dd55cca7f733eda67d (patch)
tree5856bb22753aea125444429d7a3458098e99cdc8 /src/com/android/camera/PhotoMenu.java
parent7d80bdb6ca1db08ecd29389ac7f263ecff6c5b70 (diff)
downloadandroid_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
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rwxr-xr-xsrc/com/android/camera/PhotoMenu.java4
1 files changed, 3 insertions, 1 deletions
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
};