diff options
| -rw-r--r-- | res/layout/review_thumbnail.xml | 1 | ||||
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/res/layout/review_thumbnail.xml b/res/layout/review_thumbnail.xml index 08cf276..1d80687 100644 --- a/res/layout/review_thumbnail.xml +++ b/res/layout/review_thumbnail.xml @@ -20,5 +20,6 @@ android:onClick="onThumbnailClicked" android:clickable="true" android:focusable="false" + android:visibility="gone" android:background="@drawable/border_last_picture"> </com.android.camera.ui.RotateImageView> diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index db0c0fc..369fc64 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)); } |