diff options
| author | Angus Kong <shkong@google.com> | 2011-08-24 21:22:24 +0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2011-08-24 21:55:58 +0800 |
| commit | f26e1ab12cb3f359fe1d6efcbe65344a3a0bf276 (patch) | |
| tree | e0dd060eda74d969e87cccfb4075f9482ea8eefe /src/com/android/camera/panorama | |
| parent | 2a0d096719984d75d5733a1dbac177a73e2e2452 (diff) | |
| download | LegacyCamera-f26e1ab12cb3f359fe1d6efcbe65344a3a0bf276.zip LegacyCamera-f26e1ab12cb3f359fe1d6efcbe65344a3a0bf276.tar.gz LegacyCamera-f26e1ab12cb3f359fe1d6efcbe65344a3a0bf276.tar.bz2 | |
Controls animates in and out.
The controls on the right now slide out before capturing and slide in after review.
bug: 5146822
Change-Id: Ie9d162b4231bb77bdd155589e0c0443115a4cc98
Diffstat (limited to 'src/com/android/camera/panorama')
| -rw-r--r-- | src/com/android/camera/panorama/PanoramaActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java index f58b34d..a36ebc5 100644 --- a/src/com/android/camera/panorama/PanoramaActivity.java +++ b/src/com/android/camera/panorama/PanoramaActivity.java @@ -48,6 +48,8 @@ import android.os.Message; import android.util.Log; import android.view.View; import android.view.WindowManager; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; @@ -91,6 +93,7 @@ public class PanoramaActivity extends Activity implements private CaptureView mCaptureView; private MosaicRendererSurfaceView mMosaicView; private TextView mTooFastPrompt; + private Animation mSlideIn, mSlideOut; private ProgressDialog mProgressDialog; private String mPreparePreviewString; @@ -136,6 +139,10 @@ public class PanoramaActivity extends Activity implements mGeneratePanoramaString = getResources().getString(R.string.pano_dialog_generate_panorama); + Context context = getApplicationContext(); + mSlideIn = AnimationUtils.loadAnimation(context, R.anim.slide_in_from_right); + mSlideOut = AnimationUtils.loadAnimation(context, R.anim.slide_out_to_right); + mMainHandler = new Handler() { @Override public void handleMessage(Message msg) { @@ -345,6 +352,7 @@ 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); } @@ -472,6 +480,7 @@ public class PanoramaActivity extends Activity implements mStopCaptureButton.setVisibility(View.GONE); mCaptureView.setVisibility(View.GONE); mPanoControlLayout.setVisibility(View.VISIBLE); + mPanoControlLayout.startAnimation(mSlideIn); mCaptureLayout.setVisibility(View.VISIBLE); mMosaicFrameProcessor.reset(); |