am 5a4ed853: Add default duration constant to AnimUtils class.
* commit '5a4ed853b9fe9abcd47d83e90da0ba33a10c87e2':
Add default duration constant to AnimUtils class.
diff --git a/src/com/android/contacts/common/animation/AnimUtils.java b/src/com/android/contacts/common/animation/AnimUtils.java
index 6872afb..a3926a2 100644
--- a/src/com/android/contacts/common/animation/AnimUtils.java
+++ b/src/com/android/contacts/common/animation/AnimUtils.java
@@ -22,6 +22,8 @@
import android.view.ViewPropertyAnimator;
public class AnimUtils {
+ public static final int DEFAULT_DURATION = -1;
+
public static void crossFadeViews(final View fadeIn, final View fadeOut, int duration) {
fadeIn(fadeIn, duration);
fadeOut(fadeOut, duration);
@@ -42,7 +44,11 @@
fadeOut.setVisibility(View.GONE);
fadeOut.setAlpha(0);
}
- }).setDuration(duration).start();
+ });
+ if (duration != DEFAULT_DURATION) {
+ animator.setDuration(duration);
+ }
+ animator.start();
}
public static void fadeIn(final View fadeIn, int duration) {
@@ -59,6 +65,10 @@
public void onAnimationCancel(Animator animation) {
fadeIn.setAlpha(1);
}
- }).setDuration(duration).start();
+ });
+ if (duration != DEFAULT_DURATION) {
+ animator.setDuration(duration);
+ }
+ animator.start();
}
}