commit 7d039fbe07687c9046b23b9a3735fe8f95906dde
author Romain Guy <romainguy@android.com> Fri Feb 05 10:33:44 2010 -0800
committer Android Code Review <code-review@android.com> Fri Feb 05 10:33:44 2010 -0800
tree 272b8e8cd415f010fbe4142b3da1970d667401c1
parent 4766defdd0778d7e0a656179d03a4865a9a40523
parent 8621cfa43fd12b5ad1376eb1a2454729ce9d9c7e

Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method"

core/java/android/view/animation/Animation.java

diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java
index c8396c4..000e4ce 100644
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -880,7 +880,7 @@
         region.inset(-1.0f, -1.0f);
         if (mFillBefore) {
             final Transformation previousTransformation = mPreviousTransformation;
-            applyTransformation(0.0f, previousTransformation);
+            applyTransformation(mInterpolator.getInterpolation(0.0f), previousTransformation);
         }
     }
 

core/java/android/view/animation/AnimationSet.java

diff --git a/core/java/android/view/animation/AnimationSet.java b/core/java/android/view/animation/AnimationSet.java
index 98b2594..1546dcd 100644
--- a/core/java/android/view/animation/AnimationSet.java
+++ b/core/java/android/view/animation/AnimationSet.java
@@ -282,7 +282,9 @@
                 final Animation a = animations.get(i);
 
                 temp.clear();
-                a.applyTransformation(0.0f, temp);
+                final Interpolator interpolator = a.mInterpolator;
+                a.applyTransformation(interpolator != null ? interpolator.getInterpolation(0.0f)
+                        : 0.0f, temp);
                 previousTransformation.compose(temp);
             }
         }