diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-05 09:42:36 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-05 09:42:36 -0800 |
commit | b755c62979355e5259cb394ef660cc257de4db0b (patch) | |
tree | 76439886de4def32088828e500bca8e8056d2fc3 /res/values | |
parent | 49e39aae3576b0b121e64bb7c73f7ba2f7fd2e37 (diff) | |
parent | 47e7dd7a0d40d4959f9324981830e6cbacfcfc68 (diff) | |
download | android_packages_apps_Snap-b755c62979355e5259cb394ef660cc257de4db0b.tar.gz android_packages_apps_Snap-b755c62979355e5259cb394ef660cc257de4db0b.tar.bz2 android_packages_apps_Snap-b755c62979355e5259cb394ef660cc257de4db0b.zip |
Merge "Camera2: Adding support for 4kx2k resolution"
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/arrays.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 61548b7e6..c600cffd7 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -18,6 +18,8 @@ <resources> <!-- Camera Preferences Video Quality entries --> <string-array name="pref_video_quality_entries" translatable="false"> + <item>@string/pref_video_quality_entry_4kdci</item> + <item>@string/pref_video_quality_entry_4kuhd</item> <item>@string/pref_video_quality_entry_1080p</item> <item>@string/pref_video_quality_entry_720p</item> <item>@string/pref_video_quality_entry_480p</item> @@ -31,6 +33,10 @@ </string-array> <string-array name="pref_video_quality_entryvalues" translatable="false"> + <!-- The integer value of CamcorderProfile.QUALITY_4kDCI --> + <item>13</item> + <!-- The integer value of CamcorderProfile.QUALITY_4kUHD --> + <item>12</item> <!-- The integer value of CamcorderProfile.QUALITY_1080P --> <item>6</item> <!-- The integer value of CamcorderProfile.QUALITY_720P --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 04b765879..dfee17b37 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -230,6 +230,14 @@ <string name="pref_video_quality_title">Video quality</string> <!-- The default quality value is 3 (CIF) --> <string name="pref_video_quality_default" translatable="false">3</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"> + 4k DCI</string> + <!-- Video quality setting entry. + Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] --> + <string name="pref_video_quality_entry_4kuhd" translatable="false"> + 4k UHD</string> <!-- Video quality setting entry. Videos will be recorded in 1080p quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_1080p" translatable="false">HD 1080p</string> <!-- Video quality setting entry. Videos will be recorded in 720p quality. [CHAR LIMIT=24] --> |