removing workaround for fixed animator bug
Change-Id: I244b1c83f5659cf55e1f172ae33f63adbdcf2ea5
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index bf72add..40cd74b 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -22,6 +22,7 @@
import com.android.launcher2.Workspace.ShrinkState;
import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
@@ -337,9 +338,9 @@
ValueAnimator alphaAnim = ObjectAnimator.ofFloat(mCustomizePagedView,
"alpha", alpha, 0.0f);
alphaAnim.setDuration(duration);
- alphaAnim.addListener(new LauncherAnimatorListenerAdapter() {
+ alphaAnim.addListener(new AnimatorListenerAdapter() {
@Override
- public void onAnimationEndOrCancel(Animator animation) {
+ public void onAnimationEnd(Animator animation) {
String tag = mHomeCustomizationDrawer.getCurrentTabTag();
if (tag == WIDGETS_TAG) {
mCustomizePagedView.setCustomizationFilter(
@@ -2541,13 +2542,13 @@
if (seq != null) {
Animator anim = ObjectAnimator.ofFloat(view, "alpha", show ? 1.0f : 0.0f);
anim.setDuration(duration);
- anim.addListener(new LauncherAnimatorListenerAdapter() {
+ anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
if (showing) showToolbarButton(view);
}
@Override
- public void onAnimationEndOrCancel(Animator animation) {
+ public void onAnimationEnd(Animator animation) {
if (hiding) hideToolbarButton(view);
}
});
@@ -2648,7 +2649,7 @@
scaleAnim.setDuration(duration);
scaleAnim.setInterpolator(new Workspace.ZoomOutInterpolator());
- scaleAnim.addListener(new LauncherAnimatorListenerAdapter() {
+ scaleAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
// Prepare the position
@@ -2658,7 +2659,7 @@
toView.setAlpha(1.0f);
}
@Override
- public void onAnimationEndOrCancel(Animator animation) {
+ public void onAnimationEnd(Animator animation) {
// If we don't set the final scale values here, if this animation is cancelled
// it will have the wrong scale value and subsequent cameraPan animations will
// not fix that
@@ -2731,9 +2732,9 @@
ValueAnimator alphaAnim = ObjectAnimator.ofPropertyValuesHolder(fromView,
PropertyValuesHolder.ofFloat("alpha", 1.0f, 0.0f));
alphaAnim.setDuration(res.getInteger(R.integer.config_allAppsFadeOutTime));
- alphaAnim.addListener(new LauncherAnimatorListenerAdapter() {
+ alphaAnim.addListener(new AnimatorListenerAdapter() {
@Override
- public void onAnimationEndOrCancel(Animator animation) {
+ public void onAnimationEnd(Animator animation) {
fromView.setVisibility(View.GONE);
}
});
@@ -2793,7 +2794,7 @@
if (animated) {
if (mStateAnimation != null) mStateAnimation.cancel();
mStateAnimation = new AnimatorSet();
- mStateAnimation.addListener(new LauncherAnimatorListenerAdapter() {
+ mStateAnimation.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
toView.setVisibility(View.VISIBLE);
@@ -2801,7 +2802,7 @@
toView.setAlpha(1.0f);
}
@Override
- public void onAnimationEndOrCancel(Animator animation) {
+ public void onAnimationEnd(Animator animation) {
fromView.setVisibility(View.GONE);
}
});