summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-12-17 14:18:37 +0800
committerWu-cheng Li <wuchengli@google.com>2010-12-17 14:23:35 +0800
commit286727c4681ccdc0b9832ff006accf569ddab172 (patch)
tree1c1adace84438331ea330bf21970151cfda4aa79 /src/com/android/camera/CameraSettings.java
parent7f01a4587e989b2265c9e24d9c8cb3d1a47506f9 (diff)
downloadpackages_apps_LegacyCamera-286727c4681ccdc0b9832ff006accf569ddab172.zip
packages_apps_LegacyCamera-286727c4681ccdc0b9832ff006accf569ddab172.tar.gz
packages_apps_LegacyCamera-286727c4681ccdc0b9832ff006accf569ddab172.tar.bz2
Remove the 30-minute limitation of video length.
New devices do not have this limitation anymore. Change-Id: I48e30c55a5375b6926c861c5d2f2466f54e87ea9
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 9310de4..e585e8a 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -64,13 +64,10 @@ public class CameraSettings {
// max video duration in seconds for mms and youtube.
private static final int MMS_VIDEO_DURATION = CamcorderProfile.get(CamcorderProfile.QUALITY_LOW).duration;
private static final int YOUTUBE_VIDEO_DURATION = 15 * 60; // 15 mins
- private static final int DEFAULT_VIDEO_DURATION = 30 * 60; // 30 mins
+ private static final int DEFAULT_VIDEO_DURATION = 0; // no limit
public static final String DEFAULT_VIDEO_QUALITY_VALUE = "high";
- // MMS video length
- public static final int DEFAULT_VIDEO_DURATION_VALUE = -1;
-
private static final String TAG = "CameraSettings";
private final Context mContext;
@@ -371,7 +368,7 @@ public class CameraSettings {
} else if (VIDEO_QUALITY_YOUTUBE.equals(quality)) {
return YOUTUBE_VIDEO_DURATION * 1000;
}
- return DEFAULT_VIDEO_DURATION * 1000;
+ return DEFAULT_VIDEO_DURATION;
}
public static int readPreferredCameraId(SharedPreferences pref) {