diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-14 09:30:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-14 09:30:44 -0800 |
| commit | b8a211285617dbecc49cf391db9219d82f38bdfd (patch) | |
| tree | 8c230c8dfa71c76392b8a68eeea31e73ddb4f8b1 | |
| parent | bf220f28502268d071d5466107650c0e9fe90268 (diff) | |
| parent | 2b80b5abc38ea5d434f3ceac2c4f599ae2ed4dc0 (diff) | |
| download | android_packages_apps_Snap-b8a211285617dbecc49cf391db9219d82f38bdfd.tar.gz android_packages_apps_Snap-b8a211285617dbecc49cf391db9219d82f38bdfd.tar.bz2 android_packages_apps_Snap-b8a211285617dbecc49cf391db9219d82f38bdfd.zip | |
Merge "SnapdragonCamera: Add HVGA (480x360) video quality."
| -rw-r--r-- | res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 408d5064d..581146cc6 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -26,6 +26,7 @@ <item>@string/pref_video_quality_entry_fwvga</item> <item>@string/pref_video_quality_entry_wvga</item> <item>@string/pref_video_quality_entry_vga</item> + <item>@string/pref_video_quality_entry_hvga</item> <item>@string/pref_video_quality_entry_wqvga</item> <item>@string/pref_video_quality_entry_cif</item> <item>@string/pref_video_quality_entry_qvga</item> @@ -40,6 +41,7 @@ <item>864x480</item> <item>800x480</item> <item>640x480</item> + <item>480x360</item> <item>400x240</item> <item>352x288</item> <item>320x240</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 7e4988a01..faf21e681 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -25,6 +25,8 @@ <string name="pref_video_quality_entry_wvga" translatable="false">WVGA</string> <!-- Video quality setting entry. Videos will be recorded in VGA quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_vga" translatable="false">VGA</string> + <!-- Video quality setting entry. Videos will be recorded in HVGA quality. [CHAR LIMIT=24] --> + <string name="pref_video_quality_entry_hvga" translatable="false">HVGA</string> <!-- Video quality setting entry. Videos will be recorded in WQVGA quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_wqvga" translatable="false">WQVGA</string> <!-- Video quality setting entry. Videos will be recorded in CIF quality. [CHAR LIMIT=24] --> diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 7b5b2e7a6..37fc39718 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -266,6 +266,7 @@ public class CameraSettings { VIDEO_QUALITY_TABLE.put("864x480", CamcorderProfile.QUALITY_FWVGA); VIDEO_QUALITY_TABLE.put("800x480", CamcorderProfile.QUALITY_WVGA); VIDEO_QUALITY_TABLE.put("640x480", CamcorderProfile.QUALITY_VGA); + VIDEO_QUALITY_TABLE.put("480x360", CamcorderProfile.QUALITY_HVGA); VIDEO_QUALITY_TABLE.put("400x240", CamcorderProfile.QUALITY_WQVGA); VIDEO_QUALITY_TABLE.put("352x288", CamcorderProfile.QUALITY_CIF); VIDEO_QUALITY_TABLE.put("320x240", CamcorderProfile.QUALITY_QVGA); |