summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/setupwizard/ui
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-02-13 15:26:54 -0800
committercretin45 <cretin45@gmail.com>2015-02-13 15:26:54 -0800
commitaaec6f7e3e46081f256465fe549a56cde6332b78 (patch)
treeba15bf726c59c169ff80d6939e65cb302ef3f2bd /src/com/cyanogenmod/setupwizard/ui
parent16486aead0176916174b5234b2a73fb4a833ff7a (diff)
downloadpackages_apps_SetupWizard-aaec6f7e3e46081f256465fe549a56cde6332b78.zip
packages_apps_SetupWizard-aaec6f7e3e46081f256465fe549a56cde6332b78.tar.gz
packages_apps_SetupWizard-aaec6f7e3e46081f256465fe549a56cde6332b78.tar.bz2
SetupWizard: Cleanup end animation
Change-Id: Ie941b426b57dc39d18632ac4a68bb0c3526385fc
Diffstat (limited to 'src/com/cyanogenmod/setupwizard/ui')
-rw-r--r--src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java10
1 files 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();
}
});
}