summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 7605f65f6..80115b238 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -570,6 +570,14 @@ public class CameraSettings {
return split(str);
}
+ // add auto as a valid video snapshot size.
+ public static List<String> getSupportedVideoSnapSizes(Parameters params) {
+ List<String> sizes = sizeListToStringList(params.getSupportedPictureSizes());
+ sizes.add(0, "auto");
+
+ return sizes;
+ }
+
// Splits a comma delimited string to an ArrayList of String.
// Return null if the passing string is null or the size is 0.
private static ArrayList<String> split(String str) {
@@ -741,12 +749,9 @@ public class CameraSettings {
autoExposure, mParameters.getSupportedAutoexposure());
}
- if (!mParameters.isPowerModeSupported()){
- filterUnsupportedOptions(group,
- videoSnapSize, null);
- } else {
- filterUnsupportedOptions(group, videoSnapSize, sizeListToStringList(
- mParameters.getSupportedPictureSizes()));
+ if(videoSnapSize != null) {
+ filterUnsupportedOptions(group, videoSnapSize, getSupportedVideoSnapSizes(mParameters));
+ filterSimilarPictureSize(group, videoSnapSize);
}
if (histogram!= null) {