diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-26 15:58:30 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-26 15:58:30 -0700 |
commit | cf50c164afdcb43aa8cb03eb5e450568d6b33512 (patch) | |
tree | d0e13253bf10508003b3fe4b642c4ccaa0ca41e9 | |
parent | cda0a5f39efcc243c6066bb997d533b3e7a84595 (diff) | |
parent | e85a5f1462205e73ce32ef6e8003bfee622aa002 (diff) | |
download | android_packages_apps_Snap-cf50c164afdcb43aa8cb03eb5e450568d6b33512.tar.gz android_packages_apps_Snap-cf50c164afdcb43aa8cb03eb5e450568d6b33512.tar.bz2 android_packages_apps_Snap-cf50c164afdcb43aa8cb03eb5e450568d6b33512.zip |
Merge "SnapdragonCamera: Add QHD and 2K video qualities."
-rw-r--r-- | res/values/arrays.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index cb100af64..12cff4dbf 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -20,6 +20,8 @@ <string-array name="pref_video_quality_entries" translatable="false"> <item>@string/pref_video_quality_entry_4kdci</item> <item>@string/pref_video_quality_entry_2160p</item> + <item>@string/pref_video_quality_entry_qHD</item> + <item>@string/pref_video_quality_entry_2k</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> @@ -35,6 +37,8 @@ <string-array name="pref_video_quality_entryvalues" translatable="false"> <item>4096x2160</item> <item>3840x2160</item> + <item>2560x1440</item> + <item>2048x1080</item> <item>1920x1080</item> <item>1280x720</item> <item>720x480</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1a2b8879f..1fe80abdc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,6 +258,10 @@ <string name="pref_video_quality_entry_720p" translatable="false">HD 720p</string> <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_480p" translatable="false">SD 480p</string> + <!-- Video quality setting entry. Videos will be recorded in QHD quality. [CHAR LIMIT=24] --> + <string name="pref_video_quality_entry_qHD" translatable="false">QHD</string> + <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] --> + <string name="pref_video_quality_entry_2k" translatable="false">2K</string> <!-- Describes the preference dialog for choosing interval between frame capture for time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] --> diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 9d8b18135..053381122 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -278,6 +278,8 @@ public class CameraSettings { //video qualities VIDEO_QUALITY_TABLE.put("4096x2160", CamcorderProfile.QUALITY_4kDCI); VIDEO_QUALITY_TABLE.put("3840x2160", CamcorderProfile.QUALITY_2160P); + VIDEO_QUALITY_TABLE.put("2560x1440", CamcorderProfile.QUALITY_QHD); + VIDEO_QUALITY_TABLE.put("2048x1080", CamcorderProfile.QUALITY_2k); VIDEO_QUALITY_TABLE.put("1920x1080", CamcorderProfile.QUALITY_1080P); VIDEO_QUALITY_TABLE.put("1280x720", CamcorderProfile.QUALITY_720P); VIDEO_QUALITY_TABLE.put("720x480", CamcorderProfile.QUALITY_480P); |