summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vineeta Srivastava <vsrivastava@google.com> 2015-07-08 01:40:22 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-08 01:40:22 +0000
commit7c1fa964ee9cbd1955d1b51d919afd07d3efd9c8 (patch)
tree914c3b0267d52f567f7f18f34b74b8120751a3ee
parent854f27da4482365176409d7d9ad51c6ccfbfcaa8 (diff)
parent4b4c02d12623fd5e84b0f92b6d3f3cde50580509 (diff)
am 4b4c02d1: am bfc7926f: am 1a0c150d: am 578eef70: Merge "Enforce camera shutter sound for India" into mnc-dev
* commit '4b4c02d12623fd5e84b0f92b6d3f3cde50580509': Enforce camera shutter sound for India
-rw-r--r--core/res/res/values-mcc404/config.xml2
-rw-r--r--core/res/res/values-mcc405/config.xml2
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values-mcc404/config.xml b/core/res/res/values-mcc404/config.xml
index a106b0ae2cec..17539d81fa65 100644
--- a/core/res/res/values-mcc404/config.xml
+++ b/core/res/res/values-mcc404/config.xml
@@ -23,4 +23,6 @@
<item>404</item>
<item>405</item>
</string-array>
+ <!-- Whether camera shutter sound is forced or not (country specific). -->
+ <bool name="config_camera_sound_forced">true</bool>
</resources>
diff --git a/core/res/res/values-mcc405/config.xml b/core/res/res/values-mcc405/config.xml
index a106b0ae2cec..17539d81fa65 100644
--- a/core/res/res/values-mcc405/config.xml
+++ b/core/res/res/values-mcc405/config.xml
@@ -23,4 +23,6 @@
<item>404</item>
<item>405</item>
</string-array>
+ <!-- Whether camera shutter sound is forced or not (country specific). -->
+ <bool name="config_camera_sound_forced">true</bool>
</resources>