diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-07-26 16:05:33 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:14:28 -0700 |
commit | 904d5069547dcb6a90175558ba3c608f0465d1eb (patch) | |
tree | d1a93aa193ad8341232e862f97b14f1a4c15c4cf /res | |
parent | e379705fbf684da08d1ae3ecb0c49db709deb0b3 (diff) | |
download | android_packages_apps_Snap-904d5069547dcb6a90175558ba3c608f0465d1eb.tar.gz android_packages_apps_Snap-904d5069547dcb6a90175558ba3c608f0465d1eb.tar.bz2 android_packages_apps_Snap-904d5069547dcb6a90175558ba3c608f0465d1eb.zip |
SnapdragonCamera: Add shutter sound to camera2
Add shutter sound menu to settings and allow user to turn on/off
shutter sound in camera2 mode
CRs-Fixed: 1050117
Change-Id: I624f28428415b8dde7da6e4908c26dd59bb3fbdb
Diffstat (limited to 'res')
-rw-r--r-- | res/values/camera2arrays.xml | 10 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 8 | ||||
-rw-r--r-- | res/xml/capture_preferences.xml | 7 |
3 files changed, 25 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index bb5eeca50..1f590fc32 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -829,4 +829,14 @@ for time lapse recording --> <item>@string/pref_camera2_videosnap_value_enable</item> <item>@string/pref_camera2_videosnap_value_disable</item> </string-array> + + <string-array name="pref_camera2_shutter_sound_entries" translatable="true"> + <item>@string/pref_camera2_shutter_sound_entry_on</item> + <item>@string/pref_camera2_shutter_sound_entry_off</item> + </string-array> + + <string-array name="pref_camera2_shutter_sound_entryvalues" translatable="false"> + <item>@string/pref_camera2_shutter_sound_value_on</item> + <item>@string/pref_camera2_shutter_sound_value_off</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index c75be9ab0..330cb8979 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1026,5 +1026,13 @@ <string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string> <string name="bestpicture_done" translatable="true">DONE</string> <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string> + + <string name="pref_camera2_shutter_sound_default" translatable="true">on</string> + <string name="pref_camera2_shutter_sound_value_on" translatable="true">on</string> + <string name="pref_camera2_shutter_sound_value_off" translatable="true">off</string> + + <string name="pref_camera2_shutter_sound_entry_on" translatable="true">On</string> + <string name="pref_camera2_shutter_sound_entry_off" translatable="true">Off</string> + <string name="pref_camera2_shutter_sound_title" translatable="true">Shutter Sound</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index a55cae460..dae2c5f7d 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -303,4 +303,11 @@ camera:key="pref_selfie_flash_key" camera:singleIcon="@drawable/ic_settings_flash" camera:title="@string/pref_selfie_flash_title" /> + + <ListPreference + camera:defaultValue="@string/pref_camera2_shutter_sound_default" + camera:entries="@array/pref_camera2_shutter_sound_entries" + camera:entryValues="@array/pref_camera2_shutter_sound_entryvalues" + camera:key="pref_camera2_shutter_sound_key" + camera:title="@string/pref_camera2_shutter_sound_title" /> </PreferenceGroup> |