diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 13:55:16 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 13:55:16 -0800 |
| commit | ad9bcb22d05fbf130ac64254abd51a137e9a3d3f (patch) | |
| tree | 51ef94ac11b8822b27b06da4669375863ece12b8 /core | |
| parent | 0af0449301e72a52beeed8f26021e5460004d67a (diff) | |
| parent | 7d039fbe07687c9046b23b9a3735fe8f95906dde (diff) | |
| download | frameworks_base-ad9bcb22d05fbf130ac64254abd51a137e9a3d3f.zip frameworks_base-ad9bcb22d05fbf130ac64254abd51a137e9a3d3f.tar.gz frameworks_base-ad9bcb22d05fbf130ac64254abd51a137e9a3d3f.tar.bz2 | |
merge from open-source master
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/animation/Animation.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/animation/AnimationSet.java | 4 |
2 files changed, 4 insertions, 2 deletions
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 @@ public abstract class Animation implements Cloneable { region.inset(-1.0f, -1.0f); if (mFillBefore) { final Transformation previousTransformation = mPreviousTransformation; - applyTransformation(0.0f, previousTransformation); + applyTransformation(mInterpolator.getInterpolation(0.0f), previousTransformation); } } 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 @@ public class AnimationSet extends Animation { 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); } } |