summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/panorama
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2011-10-18 06:58:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-18 06:58:26 -0700
commitd7a60abbee203872df4b5ab9a873e7efad80e239 (patch)
treed27ea47a42168b00e8447c954bb4c2a853ddded9 /src/com/android/camera/panorama
parentff55f519629fbe839fe051108b396565403d696e (diff)
parent4a3026b84fa4fd403317b30b6a9db61125fecfa2 (diff)
downloadLegacyCamera-d7a60abbee203872df4b5ab9a873e7efad80e239.zip
LegacyCamera-d7a60abbee203872df4b5ab9a873e7efad80e239.tar.gz
LegacyCamera-d7a60abbee203872df4b5ab9a873e7efad80e239.tar.bz2
Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0
Diffstat (limited to 'src/com/android/camera/panorama')
-rwxr-xr-xsrc/com/android/camera/panorama/PanoramaActivity.java3
1 files changed, 3 insertions, 0 deletions
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 @@ 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;
@@ -579,6 +580,7 @@ public class PanoramaActivity extends ActivityBase implements
mCaptureIndicator.setVisibility(View.GONE);
hideTooFastIndication();
hideDirectionIndicators();
+ mThumbnailView.setEnabled(true);
mMosaicFrameProcessor.setProgressListener(null);
stopCameraPreview();
@@ -679,6 +681,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);