commit 0fb95f01f5b17ac3e19f2b336c1d8e69e513edc0
author Yorke Lee <yorkelee@google.com> Wed Jul 31 22:05:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 31 22:05:20 2013 +0000
tree 22d2931c945c841cef6de3e7a7c8a283db0085e8
parent c3766338b312f9c8a6bdb2facaf4b0a4bd199de4
parent 11a9968c65835512ae9b79b9c029042b9a304ebf

Merge "Prevent animation length from going negative"

src/com/android/dialer/list/PhoneFavoriteTileView.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index 9a1577a..4efc4db 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -135,6 +135,7 @@
             // favorite removal view to the foreground to ask user to confirm removal.
             int animationLength = (int) ((1 - Math.abs(mFavoriteContactCard.getTranslationX()) /
                     getWidth()) * ANIMATION_LENGTH);
+            animationLength = Math.max(0, animationLength);
             final ObjectAnimator fadeOut = ObjectAnimator.ofFloat(mFavoriteContactCard, "alpha",
                     0.f).setDuration(animationLength);
             final ObjectAnimator moveAway = ObjectAnimator.ofFloat(mFavoriteContactCard,