diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-08 05:20:53 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-09-08 06:06:57 +0800 |
| commit | da7b4ed9303499c4449c7069461db42ff37e3e3f (patch) | |
| tree | 302fbd3f6d702488dfdd6d93e332177de7df568c /src/com/android | |
| parent | a93a4d60eacee4e12471b45f8691c14114e113a4 (diff) | |
| download | packages_apps_LegacyCamera-da7b4ed9303499c4449c7069461db42ff37e3e3f.zip packages_apps_LegacyCamera-da7b4ed9303499c4449c7069461db42ff37e3e3f.tar.gz packages_apps_LegacyCamera-da7b4ed9303499c4449c7069461db42ff37e3e3f.tar.bz2 | |
Use the same thumbnail in camera and camcorder.
bug:5187868
Change-Id: I47aa460db3005ed494a2b760d31e8c17d896ac85
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/Thumbnail.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 6012c8d..e2fd9e8 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -87,8 +87,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, private static final String TAG = "camera"; - private static final String LAST_THUMB_FILENAME = "image_last_thumb"; - private static final int CROP_MSG = 1; private static final int FIRST_TIME_INIT = 2; private static final int RESTART_PREVIEW = 3; @@ -408,7 +406,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, private void initThumbnailButton() { // Load the thumbnail from the disk. - mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), LAST_THUMB_FILENAME)); + mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME)); updateThumbnailButton(); } @@ -1288,7 +1286,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mOrientationListener.disable(); if (!mIsImageCaptureIntent) { if (mThumbnail != null) { - mThumbnail.saveTo(new File(getFilesDir(), LAST_THUMB_FILENAME)); + mThumbnail.saveTo(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME)); } } hidePostCaptureAlert(); diff --git a/src/com/android/camera/Thumbnail.java b/src/com/android/camera/Thumbnail.java index f4caea9..01569c5 100644 --- a/src/com/android/camera/Thumbnail.java +++ b/src/com/android/camera/Thumbnail.java @@ -43,6 +43,7 @@ import java.io.IOException; public class Thumbnail { private static final String TAG = "Thumbnail"; + public static final String LAST_THUMB_FILENAME = "last_thumb"; private static final int BUFSIZE = 4096; private Uri mUri; diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 432404b..66418db 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -88,8 +88,6 @@ public class VideoCamera extends ActivityBase private static final String TAG = "videocamera"; - private static final String LAST_THUMB_FILENAME = "video_last_thumb"; - private static final int CHECK_DISPLAY_ROTATION = 3; private static final int CLEAR_SCREEN_DELAY = 4; private static final int UPDATE_RECORD_TIME = 5; @@ -961,7 +959,7 @@ public class VideoCamera extends ActivityBase resetScreenOn(); if (!mIsVideoCaptureIntent && mThumbnail != null) { - mThumbnail.saveTo(new File(getFilesDir(), LAST_THUMB_FILENAME)); + mThumbnail.saveTo(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME)); } if (mStorageHint != null) { @@ -1681,7 +1679,7 @@ public class VideoCamera extends ActivityBase mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail); mThumbnailView.setVisibility(View.VISIBLE); // Load the thumbnail from the disk. - mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), LAST_THUMB_FILENAME)); + mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME)); } private void updateThumbnailButton() { |