summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-09-11 01:54:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-09-11 01:54:16 -0700
commit7c0e9cc3c2f60eced35ad5c475fae22ea27341bf (patch)
treed9c21e511509f39f8dcb97a82f74cdb14feeed13 /res/values
parentdebbc5ad3c08db8f7c0a35a9d39dc11d95bca8c2 (diff)
parente07e72ac2bbe4dc0160b5feff6084e31a98ea8e4 (diff)
downloadandroid_packages_apps_Snap-7c0e9cc3c2f60eced35ad5c475fae22ea27341bf.tar.gz
android_packages_apps_Snap-7c0e9cc3c2f60eced35ad5c475fae22ea27341bf.tar.bz2
android_packages_apps_Snap-7c0e9cc3c2f60eced35ad5c475fae22ea27341bf.zip
Merge "Camera: Add support for video rotation"
Diffstat (limited to 'res/values')
-rwxr-xr-xres/values/arrays.xml22
-rw-r--r--res/values/qcomstrings.xml14
-rwxr-xr-xres/values/strings.xml7
3 files changed, 43 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index fce85b8a3..d1baeaeb5 100755
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -597,4 +597,26 @@
<item>@string/pref_camera_countdown_label_fifteen</item>
</string-array>
+ <!-- VideoCamera Preferences video rotations entry-->
+ <string-array name="pref_camera_video_rotation_entries" translatable="false">
+ <item>@string/pref_camera_video_rotation_entry_0</item>
+ <item>@string/pref_camera_video_rotation_entry_90</item>
+ <item>@string/pref_camera_video_rotation_entry_180</item>
+ <item>@string/pref_camera_video_rotation_entry_270</item>
+ </string-array>
+
+ <string-array name="pref_camera_video_rotation_labels" translatable="false">
+ <item>@string/pref_camera_video_rotation_label_0</item>
+ <item>@string/pref_camera_video_rotation_label_90</item>
+ <item>@string/pref_camera_video_rotation_label_180</item>
+ <item>@string/pref_camera_video_rotation_label_270</item>
+ </string-array>
+
+ <string-array name="pref_camera_video_rotation_entryvalues" translatable="false">
+ <item>0</item>
+ <item>90</item>
+ <item>180</item>
+ <item>270</item>
+ </string-array>
+
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 70ce6e1b6..c9bbaaadd 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -702,5 +702,19 @@
<string name="pref_hdr_mode_value_sensor">hdr-mode-sensor</string>
<string name="pref_hdr_mode_value_multi_frame">hdr-mode-multiframe</string>
+ <!--Default video rotation setting-->
+ <string name="pref_camera_video_rotation_default" translatable="false">0</string>
+
+ <!--Settings screen, video rotation title-->
+ <string name="pref_camera_video_rotation_title">Video Rotation</string>
+
+ <!--Menu, video rotation label-->
+ <string name="pref_camera_video_rotation_label">VIDEO ROTATION</string>
+
+ <!-- Settings screen, Video rotation dialog radio button choices -->
+ <string name="pref_camera_video_rotation_entry_0">0</string>
+ <string name="pref_camera_video_rotation_entry_90">90</string>
+ <string name="pref_camera_video_rotation_entry_180">180</string>
+ <string name="pref_camera_video_rotation_entry_270">270</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b105cfdbd..27f3b6488 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -695,4 +695,11 @@ CHAR LIMIT = NONE] -->
<!-- String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
<string name="setting_wallpaper">Setting wallpaper</string>
+
+
+ <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+ <string name="pref_camera_video_rotation_label_0">0</string>
+ <string name="pref_camera_video_rotation_label_90">90</string>
+ <string name="pref_camera_video_rotation_label_180">180</string>
+ <string name="pref_camera_video_rotation_label_270">270</string>
</resources>