diff options
author | Chih-Chung Chang <chihchung@google.com> | 2009-06-01 19:33:32 +0800 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2009-06-02 13:03:16 +0800 |
commit | b653f90f33c6f9e6b48dfab018dece9dd021a476 (patch) | |
tree | a9001c78ac9fb1bcffa30952b67284cae586c191 /src/com/android/camera/VideoCamera.java | |
parent | 565664f274abbe19b3a04962711d33868541a3da (diff) | |
download | LegacyCamera-b653f90f33c6f9e6b48dfab018dece9dd021a476.zip LegacyCamera-b653f90f33c6f9e6b48dfab018dece9dd021a476.tar.gz LegacyCamera-b653f90f33c6f9e6b48dfab018dece9dd021a476.tar.bz2 |
Issue 1860338: Remove the video size check for "share".
So the receiving end applications can queue the video to MediaUploader.
This is basically a revert of perforce CL 137817.
Diffstat (limited to 'src/com/android/camera/VideoCamera.java')
-rw-r--r-- | src/com/android/camera/VideoCamera.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index eb0e050..751015b 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -82,7 +82,6 @@ public class VideoCamera extends Activity implements View.OnClickListener, private static final long NO_STORAGE_ERROR = -1L; private static final long CANNOT_STAT_ERROR = -2L; private static final long LOW_STORAGE_THRESHOLD = 512L * 1024L; - private static final long SHARE_FILE_LENGTH_LIMIT = 3L * 1024L * 1024L; private static final int STORAGE_STATUS_OK = 0; private static final int STORAGE_STATUS_LOW = 1; @@ -122,7 +121,6 @@ public class VideoCamera extends Activity implements View.OnClickListener, // The video file that has already been recorded, and that is being // examined by the user. private String mCurrentVideoFilename; - private long mCurrentVideoFileLength = 0L; private Uri mCurrentVideoUri; private ContentValues mCurrentVideoValues; @@ -277,11 +275,6 @@ public class VideoCamera extends Activity implements View.OnClickListener, } private void startShareVideoActivity() { - if (mCurrentVideoFileLength > SHARE_FILE_LENGTH_LIMIT) { - Toast.makeText(VideoCamera.this, - R.string.too_large_to_attach, Toast.LENGTH_LONG).show(); - return; - } Intent intent = new Intent(); intent.setAction(Intent.ACTION_SEND); intent.setType("video/3gpp"); @@ -1090,10 +1083,7 @@ public class VideoCamera extends Activity implements View.OnClickListener, for (int id : hideIds) { mPostPictureAlert.findViewById(id).setVisibility(View.GONE); } - ActionMenuButton shareButton = - (ActionMenuButton) mPostPictureAlert.findViewById(R.id.share); - shareButton.setRestricted( - mCurrentVideoFileLength > SHARE_FILE_LENGTH_LIMIT); + connectAndFadeIn(connectIds); connectAndFadeIn(alwaysOnIds); mPostPictureAlert.setVisibility(View.VISIBLE); @@ -1160,13 +1150,6 @@ public class VideoCamera extends Activity implements View.OnClickListener, } mCurrentVideoFilename = mCameraVideoFilename; - try { - mCurrentVideoFileLength = - new File(mCurrentVideoFilename).length(); - } catch (RuntimeException e) { - Log.e(TAG, "get file length fail: " + e.getMessage()); - mCurrentVideoFileLength = 0; - } Log.v(TAG, "Setting current video filename: " + mCurrentVideoFilename); needToRegisterRecording = true; |