commit d7a60abbee203872df4b5ab9a873e7efad80e239
author Wei Huang <weih@google.com> Tue Oct 18 06:58:26 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 18 06:58:26 2011 -0700
tree d27ea47a42168b00e8447c954bb4c2a853ddded9
parent ff55f519629fbe839fe051108b396565403d696e
parent 4a3026b84fa4fd403317b30b6a9db61125fecfa2

Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 4eb3d4f..685319f 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1040,6 +1040,7 @@
             findViewById(R.id.btn_cancel).setVisibility(View.VISIBLE);
         } else {
             mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail);
+            mThumbnailView.enableFilter(false);
             mThumbnailView.setVisibility(View.VISIBLE);
         }
 
@@ -1180,6 +1181,7 @@
         }
         if (mModePicker != null) mModePicker.setEnabled(enable);
         if (mZoomControl != null) mZoomControl.setEnabled(enable);
+        if (mThumbnailView != null) mThumbnailView.setEnabled(enable);
     }
 
     public static int roundOrientation(int orientation) {

src/com/android/camera/panorama/PanoramaActivity.java

diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index bbd45b8..25c565f 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -541,6 +541,7 @@
         mShutterButton.setBackgroundResource(R.drawable.btn_shutter_pan_recording);
         mCaptureIndicator.setVisibility(View.VISIBLE);
         showDirectionIndicators(PanoProgressBar.DIRECTION_NONE);
+        mThumbnailView.setEnabled(false);
 
         mCompassValueXStart = mCompassValueXStartBuffer;
         mCompassValueYStart = mCompassValueYStartBuffer;
@@ -579,6 +580,7 @@
         mCaptureIndicator.setVisibility(View.GONE);
         hideTooFastIndication();
         hideDirectionIndicators();
+        mThumbnailView.setEnabled(true);
 
         mMosaicFrameProcessor.setProgressListener(null);
         stopCameraPreview();
@@ -679,6 +681,7 @@
         mCaptureIndicator = (TextView) findViewById(R.id.pano_capture_indicator);
 
         mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail);
+        mThumbnailView.enableFilter(false);
 
         mReviewLayout = (View) findViewById(R.id.pano_review_layout);
         mReview = (ImageView) findViewById(R.id.pano_reviewarea);