summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/animation/AnimationSet.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/view/animation/AnimationSet.java b/core/java/android/view/animation/AnimationSet.java
index def4d70..14d3d19 100644
--- a/core/java/android/view/animation/AnimationSet.java
+++ b/core/java/android/view/animation/AnimationSet.java
@@ -348,12 +348,13 @@ public class AnimationSet extends Animation {
for (int i = count - 1; i >= 0; --i) {
final Animation a = animations.get(i);
-
- temp.clear();
- final Interpolator interpolator = a.mInterpolator;
- a.applyTransformation(interpolator != null ? interpolator.getInterpolation(0.0f)
- : 0.0f, temp);
- previousTransformation.compose(temp);
+ if (!a.isFillEnabled() || a.getFillBefore() || a.getStartOffset() == 0) {
+ temp.clear();
+ final Interpolator interpolator = a.mInterpolator;
+ a.applyTransformation(interpolator != null ? interpolator.getInterpolation(0.0f)
+ : 0.0f, temp);
+ previousTransformation.compose(temp);
+ }
}
}
}