summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2011-08-25 09:56:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-25 09:56:08 -0700
commit86394cc38a4ef9ef4e58ef6b4e801c717eefeb73 (patch)
tree93f792847ea130127fc203c8da54261f4575502f /src
parent0918d1957886dbc8deba9a80a4bcb6b4473ccdef (diff)
parentf619ef352d74b1d1ff06d82fb4d265aa9676014b (diff)
downloadpackages_apps_LegacyCamera-86394cc38a4ef9ef4e58ef6b4e801c717eefeb73.zip
packages_apps_LegacyCamera-86394cc38a4ef9ef4e58ef6b4e801c717eefeb73.tar.gz
packages_apps_LegacyCamera-86394cc38a4ef9ef4e58ef6b4e801c717eefeb73.tar.bz2
Merge "Start capturing after the control disappears."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/panorama/PanoramaActivity.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index c33c3e4..3816c1b 100644
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -353,6 +353,8 @@ public class PanoramaActivity extends Activity implements
mTimeTaken = System.currentTimeMillis();
mCaptureState = CAPTURE_MOSAIC;
mTooFastPrompt.setVisibility(View.GONE);
+ mPanoControlLayout.startAnimation(mSlideOut);
+ mPanoControlLayout.setVisibility(View.GONE);
mMosaicFrameProcessor.setProgressListener(new MosaicFrameProcessor.ProgressListener() {
@Override
@@ -369,9 +371,6 @@ public class PanoramaActivity extends Activity implements
mStopCaptureButton.setVisibility(View.VISIBLE);
mCaptureView.setVisibility(View.VISIBLE);
mMosaicView.setVisibility(View.VISIBLE);
- mPanoControlLayout.startAnimation(mSlideOut);
- mPanoControlLayout.setVisibility(View.GONE);
-
}
private void stopCapture() {