summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorheech.park <heech.park@samsung.com>2011-10-14 16:13:04 -0700
committerWu-cheng Li <wuchengli@google.com>2011-10-18 18:21:54 +0800
commit4a3026b84fa4fd403317b30b6a9db61125fecfa2 (patch)
treec9e2a413d0aa196ae3aa6dbd450f332c83367bc2 /src
parent52c5c76bddbf3994867a00d0e266b390592486aa (diff)
downloadLegacyCamera-4a3026b84fa4fd403317b30b6a9db61125fecfa2.zip
LegacyCamera-4a3026b84fa4fd403317b30b6a9db61125fecfa2.tar.gz
LegacyCamera-4a3026b84fa4fd403317b30b6a9db61125fecfa2.tar.bz2
Disable Thumbnailview when Panorama capture is inProgress.
Step 1: Go to Camera Step 2: Change to Panorama shot Step 3: Capture Step 4: During capture tap on the album quick view Step 5: Observe that we are able to view album from quick view while capturing as panorama shot. bug:5475248 Change-Id: Ia74906e4a4c6b8b04e96724f76f98a37eaeb3189 Signed-off-by: Braganza Sam Roberts <sam.braganza@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/Camera.java2
-rwxr-xr-xsrc/com/android/camera/panorama/PanoramaActivity.java3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 8cc5816..f4ab623 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1037,6 +1037,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);
}
@@ -1177,6 +1178,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 f11bc3a..06ed3ea 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -543,6 +543,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;
@@ -580,6 +581,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);