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

* commit 'd7a60abbee203872df4b5ab9a873e7efad80e239':
  Disable Thumbnailview when Panorama capture is inProgress.

2 files changed, 5 insertions, 0 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 45e1867..54f709f 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1040,6 +1040,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
             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 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         }
         if (mModePicker != null) mModePicker.setEnabled(enable);
         if (mZoomControl != null) mZoomControl.setEnabled(enable);
+        if (mThumbnailView != null) mThumbnailView.setEnabled(enable);
     }
 
     public static int roundOrientation(int orientation) {
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 8bf5bbf..ab4f0af 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -535,6 +535,7 @@ public class PanoramaActivity extends ActivityBase implements
         mShutterButton.setBackgroundResource(R.drawable.btn_shutter_pan_recording);
         mCaptureIndicator.setVisibility(View.VISIBLE);
         showDirectionIndicators(PanoProgressBar.DIRECTION_NONE);
+        mThumbnailView.setEnabled(false);
 
         mCompassValueXStart = mCompassValueXStartBuffer;
         mCompassValueYStart = mCompassValueYStartBuffer;
@@ -573,6 +574,7 @@ public class PanoramaActivity extends ActivityBase implements
         mCaptureIndicator.setVisibility(View.GONE);
         hideTooFastIndication();
         hideDirectionIndicators();
+        mThumbnailView.setEnabled(true);
 
         mMosaicFrameProcessor.setProgressListener(null);
         stopCameraPreview();
@@ -673,6 +675,7 @@ public class PanoramaActivity extends ActivityBase implements
         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);