summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-10-06 14:50:11 -0700
committerJaimin Bhise <jbhise@codeaurora.org>2015-10-29 14:04:57 -0700
commit7a123a775778e72c208ad214858ea8d448d1538e (patch)
tree6ee72848f779a1fdb2571aa81863be7ff08425b0 /res/xml
parent454942261d26f4babd064f0c3e8459670abbab4a (diff)
downloadandroid_packages_apps_Snap-7a123a775778e72c208ad214858ea8d448d1538e.tar.gz
android_packages_apps_Snap-7a123a775778e72c208ad214858ea8d448d1538e.tar.bz2
android_packages_apps_Snap-7a123a775778e72c208ad214858ea8d448d1538e.zip
SnapdragonCamera: add video snapshot size option
Add developer option to choose video snapshot size. The "Auto" option will revert back to old behavior of choosing the largest size with the same aspect ratio as the preview. Change-Id: Ice68aef1963c1199d30e1edde4cccf7203f8fbbf
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/camera_preferences.xml6
-rw-r--r--res/xml/video_preferences.xml4
2 files changed, 2 insertions, 8 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index caf2a93d7..8d101c71e 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -289,12 +289,6 @@
camera:singleIcon="@drawable/ic_settings_storage"
camera:entryValues="@array/pref_camera_savepath_entryvalues" />
<ListPreference
- camera:key="pref_camera_videosnapsize_key"
- camera:title="@string/pref_camera_picturesize_title"
- camera:defaultValue="@string/pref_camera_videosnapsize_default"
- camera:entries="@array/pref_camera_picturesize_entries"
- camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
- <ListPreference
camera:key="pref_camera_advanced_features_key"
camera:defaultValue="@string/pref_camera_advanced_feature_default"
camera:title="@string/pref_camera_advanced_features_title"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 1937e3e3a..63346a0d1 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -154,8 +154,8 @@
camera:key="pref_camera_videosnapsize_key"
camera:defaultValue="@string/pref_camera_videosnapsize_default"
camera:title="@string/pref_camera_picturesize_title"
- camera:entries="@array/pref_camera_picturesize_entries"
- camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
+ camera:entries="@array/pref_camera_video_snapsize_entries"
+ camera:entryValues="@array/pref_camera_video_snapsize_entryvalues" />
<IconListPreference
camera:key="pref_camera_savepath_key"
camera:defaultValue="@string/pref_camera_savepath_default"