From aaec6f7e3e46081f256465fe549a56cde6332b78 Mon Sep 17 00:00:00 2001 From: cretin45 Date: Fri, 13 Feb 2015 15:26:54 -0800 Subject: [PATCH] SetupWizard: Cleanup end animation Change-Id: Ie941b426b57dc39d18632ac4a68bb0c3526385fc --- .../setupwizard/ui/SetupWizardActivity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java index b0c49c7..f0ebc75 100644 --- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java +++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java @@ -240,13 +240,19 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks animateOut(); } + @Override + public void finish() { + super.finish(); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + } + private void animateOut() { int cx = (mReveal.getLeft() + mReveal.getRight()) / 2; int cy = (mReveal.getTop() + mReveal.getBottom()) / 2; int finalRadius = Math.max(mReveal.getWidth(), mReveal.getHeight()); Animator anim = ViewAnimationUtils.createCircularReveal(mReveal, cx, cy, 0, finalRadius); - + anim.setDuration(800); anim.addListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { @@ -258,7 +264,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks mHandler.post(new Runnable() { @Override public void run() { - finishSetup();; + finishSetup(); } }); }