diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-06-17 15:52:25 -0700 |
|---|---|---|
| committer | Byunghun Jeon <bjeon@codeaurora.org> | 2016-06-29 17:13:44 -0700 |
| commit | b5821430f199a516c4b3181b63609a264e613719 (patch) | |
| tree | 617ba411d8950820e74560d1035a6d1f04e8b450 /res | |
| parent | 792e60ced545933f88726632d9fd6ba2e675d6cf (diff) | |
| download | android_packages_apps_Snap-b5821430f199a516c4b3181b63609a264e613719.tar.gz android_packages_apps_Snap-b5821430f199a516c4b3181b63609a264e613719.tar.bz2 android_packages_apps_Snap-b5821430f199a516c4b3181b63609a264e613719.zip | |
SnapdragonCamera: Allow take snapshot while recording video
Allow take snapshot while recording video by showing shutter button.
Directly call capture when shutter button is pressed.
Change-Id: Iae4d42d8878ea82b459ec67709b0ad8e340c8226
CRs-Fixed: 1028463
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/camera2arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 9 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 7 |
3 files changed, 26 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index ac569f473..089838405 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -795,4 +795,14 @@ for time lapse recording --> <item>off</item> <item>on</item> </string-array> + + <string-array name="pref_camera2_videosnap_entries" translatable="true"> + <item>@string/pref_camera2_videosnap_entry_enable</item> + <item>@string/pref_camera2_videosnap_entry_disable</item> + </string-array> + + <string-array name="pref_camera2_videosnap_entryvalues" translatable="false"> + <item>@string/pref_camera2_videosnap_value_enable</item> + <item>@string/pref_camera2_videosnap_value_disable</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 859803b23..6d1ec7862 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -994,5 +994,14 @@ <string name="pref_camera2_noise_reduction_value_off" translatable="false">off</string> <string name="pref_camera2_noise_reduction_value_fast" translatable="false">fast</string> <string name="pref_camera2_noise_reduction_value_high_quality" translatable="false">high-quality</string> + + <string name="pref_camera2_videosnap_default" translatable="false">enable</string> + <string name="pref_camera2_videosnap_title" translatable="true">Auto Snapshot Size</string> + + <string name="pref_camera2_videosnap_value_enable" translatable="true">enable</string> + <string name="pref_camera2_videosnap_value_disable" translatable="true">disable</string> + + <string name="pref_camera2_videosnap_entry_enable" translatable="true">Enable</string> + <string name="pref_camera2_videosnap_entry_disable" translatable="true">Disable</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 06f816c7f..d7d478d0a 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -266,4 +266,11 @@ camera:key="pref_camera2_facedetection_key" camera:singleIcon="@drawable/ic_settings_facerec" camera:title="@string/pref_camera_facedetection_title"/> + + <ListPreference + camera:defaultValue="@string/pref_camera2_videosnap_default" + camera:entries="@array/pref_camera2_videosnap_entries" + camera:entryValues="@array/pref_camera2_videosnap_entryvalues" + camera:key="pref_camera2_videosnap_key" + camera:title="@string/pref_camera2_videosnap_title" /> </PreferenceGroup> |