From 51dd927dbe8940e226a2d15f105e53fb2effe7dc Mon Sep 17 00:00:00 2001
From: Chih-yu Huang <akahuang@google.com>
Date: Tue, 30 Aug 2011 15:06:09 +0800
Subject: Remove thumbnail in image and video capture intent.

bug:5141555
Change-Id: I240006b82f6c694a1549208bcb580f393f07f2bf
---
 src/com/android/camera/Camera.java      | 6 +++---
 src/com/android/camera/VideoCamera.java | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

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));
     }
-- 
cgit v1.1