diff options
Diffstat (limited to 'src/com/android/camera/panorama')
| -rwxr-xr-x | src/com/android/camera/panorama/PanoramaActivity.java | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java index 412d33f..09df1e0 100755 --- a/src/com/android/camera/panorama/PanoramaActivity.java +++ b/src/com/android/camera/panorama/PanoramaActivity.java @@ -149,9 +149,6 @@ public class PanoramaActivity extends ActivityBase implements private Thumbnail mThumbnail; private SharePopup mSharePopup; - private AnimatorSet mThumbnailViewAndModePickerOut; - private AnimatorSet mThumbnailViewAndModePickerIn; - private int mPreviewWidth; private int mPreviewHeight; private Camera mCameraDevice; @@ -533,30 +530,6 @@ public class PanoramaActivity extends ActivityBase implements mCaptureIndicator.setVisibility(View.VISIBLE); showDirectionIndicators(PanoProgressBar.DIRECTION_NONE); - // XML-style animations can not be used here. The Y position has to be calculated runtime. - float ystart = mThumbnailView.getY(); - ValueAnimator va1 = ObjectAnimator.ofFloat( - mThumbnailView, "y", ystart, -mThumbnailView.getHeight()); - ValueAnimator va1Reverse = ObjectAnimator.ofFloat( - mThumbnailView, "y", -mThumbnailView.getHeight(), ystart); - ystart = mModePicker.getY(); - float height = mCaptureLayout.getHeight(); - ValueAnimator va2 = ObjectAnimator.ofFloat( - mModePicker, "y", ystart, height + 1); - ValueAnimator va2Reverse = ObjectAnimator.ofFloat( - mModePicker, "y", height + 1, ystart); - LinearInterpolator li = new LinearInterpolator(); - mThumbnailViewAndModePickerOut = new AnimatorSet(); - mThumbnailViewAndModePickerOut.play(va1).with(va2); - mThumbnailViewAndModePickerOut.setDuration(500); - mThumbnailViewAndModePickerOut.setInterpolator(li); - mThumbnailViewAndModePickerIn = new AnimatorSet(); - mThumbnailViewAndModePickerIn.play(va1Reverse).with(va2Reverse); - mThumbnailViewAndModePickerIn.setDuration(500); - mThumbnailViewAndModePickerIn.setInterpolator(li); - - mThumbnailViewAndModePickerOut.start(); - mCompassValueXStart = mCompassValueXStartBuffer; mCompassValueYStart = mCompassValueYStartBuffer; mMinAngleX = 0; @@ -578,6 +551,8 @@ public class PanoramaActivity extends ActivityBase implements } }); + if (mModePicker != null) mModePicker.setEnabled(false); + mPanoProgressBar.reset(); // TODO: calculate the indicator width according to different devices to reflect the actual // angle of view of the camera device. @@ -616,7 +591,8 @@ public class PanoramaActivity extends ActivityBase implements } }); } - mThumbnailViewAndModePickerIn.start(); + // do we have to wait for the thread to complete before enabling this? + if (mModePicker != null) mModePicker.setEnabled(true); } private void showTooFastIndication() { |