summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-27 17:00:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-27 17:00:38 -0800
commit2d894ed368689085e89b6f0b79fb355575267e97 (patch)
tree28f5d469dba72bf33f0b3660601716300f0175a8 /res
parente42a3f0ca7913bfb6e0d5b4274dd267736923583 (diff)
parentcd1f25e6cb5146dd3a00cd334f6ab4349c84b333 (diff)
downloadandroid_packages_apps_Snap-2d894ed368689085e89b6f0b79fb355575267e97.tar.gz
android_packages_apps_Snap-2d894ed368689085e89b6f0b79fb355575267e97.tar.bz2
android_packages_apps_Snap-2d894ed368689085e89b6f0b79fb355575267e97.zip
Merge "SnapdragonCamera: Set highest supported video resolution by default."
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/video_preferences.xml1
2 files changed, 0 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33597b74b..538087348 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,8 +238,6 @@
<!-- The Video quality settings in preference [CHAR LIMIT=21] -->
<string name="pref_video_quality_title">Video quality</string>
- <!-- The default quality value is (CIF) -->
- <string name="pref_video_quality_default" translatable="false">352x288</string>
<!-- Video quality setting entry.
Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
<string name="pref_video_quality_entry_4kdci" translatable="false">
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 12dfc700f..b82ca1ba3 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -19,7 +19,6 @@
camera:title="@string/pref_camcorder_settings_category">
<IconListPreference
camera:key="pref_video_quality_key"
- camera:defaultValue="@string/pref_video_quality_default"
camera:title="@string/pref_video_quality_title"
camera:entries="@array/pref_video_quality_entries"
camera:singleIcon="@drawable/ic_settings_quality"