diff options
| author | Wei Huang <weih@google.com> | 2011-10-18 06:59:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-18 06:59:30 -0700 |
| commit | 1508ab60efb9264484ab8811dee256944e4885d7 (patch) | |
| tree | 49a9fbff64e12054c0eaf06955d2442aab6903fe /src/com/android/camera/panorama | |
| parent | af327d0b5571a9bcddd3f8d69ec25dd4fc59e5b7 (diff) | |
| parent | d7a60abbee203872df4b5ab9a873e7efad80e239 (diff) | |
| download | packages_apps_LegacyCamera-1508ab60efb9264484ab8811dee256944e4885d7.zip packages_apps_LegacyCamera-1508ab60efb9264484ab8811dee256944e4885d7.tar.gz packages_apps_LegacyCamera-1508ab60efb9264484ab8811dee256944e4885d7.tar.bz2 | |
am d7a60abb: Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0
* commit 'd7a60abbee203872df4b5ab9a873e7efad80e239':
Disable Thumbnailview when Panorama capture is inProgress.
Diffstat (limited to 'src/com/android/camera/panorama')
| -rwxr-xr-x | src/com/android/camera/panorama/PanoramaActivity.java | 3 |
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 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); |