diff options
| author | Chih-yu Huang <akahuang@google.com> | 2011-08-30 15:06:09 +0800 |
|---|---|---|
| committer | Chih-yu Huang <akahuang@google.com> | 2011-08-30 16:40:29 +0800 |
| commit | 51dd927dbe8940e226a2d15f105e53fb2effe7dc (patch) | |
| tree | 862563848d207c7607ded161ed3e83aca911e933 /src | |
| parent | 2a1e44382f6a4fc70e4a89e3d183503a2255826f (diff) | |
| download | packages_apps_LegacyCamera-51dd927dbe8940e226a2d15f105e53fb2effe7dc.zip packages_apps_LegacyCamera-51dd927dbe8940e226a2d15f105e53fb2effe7dc.tar.gz packages_apps_LegacyCamera-51dd927dbe8940e226a2d15f105e53fb2effe7dc.tar.bz2 | |
Remove thumbnail in image and video capture intent.
bug:5141555
Change-Id: I240006b82f6c694a1549208bcb580f393f07f2bf
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index b5c3650..f91faae 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -593,7 +593,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, checkStorage(); } else if (action.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED)) { checkStorage(); - if (!mIsImageCaptureIntent) { + if (!mIsImageCaptureIntent) { updateThumbnailButton(); } } @@ -972,8 +972,9 @@ public class Camera extends ActivityBase implements FocusManager.Listener, setContentView(R.layout.camera_attach); } else { setContentView(R.layout.camera); + mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail); + mThumbnailView.setVisibility(View.VISIBLE); } - mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail); mPreferences = new ComboPreferences(this); CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal()); @@ -1026,7 +1027,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, if (mIsImageCaptureIntent) { setupCaptureParams(); - findViewById(R.id.review_control).setVisibility(View.VISIBLE); } else { mModePicker = (ModePicker) findViewById(R.id.mode_picker); diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 5bd3e24..4aded43 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -1529,6 +1529,7 @@ public class VideoCamera extends ActivityBase private void initThumbnailButton() { 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)); } |