From d734685c7c474f85486bc0be2710e333abff278e Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Thu, 14 Nov 2013 15:06:26 +0100 Subject: [PATCH] correctly clone keyframe with no value --- .../com/nineoldandroids/animation/Keyframe.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/library/src/com/nineoldandroids/animation/Keyframe.java b/library/src/com/nineoldandroids/animation/Keyframe.java index e7062a6..9d44f5e 100644 --- a/library/src/com/nineoldandroids/animation/Keyframe.java +++ b/library/src/com/nineoldandroids/animation/Keyframe.java @@ -308,7 +308,13 @@ public void setValue(Object value) { @Override public IntKeyframe clone() { - IntKeyframe kfClone = new IntKeyframe(getFraction(), mValue); + IntKeyframe kfClone; + if (mHasValue) { + kfClone = new IntKeyframe(getFraction(), mValue); + } + else { + kfClone = new IntKeyframe(getFraction()); + } kfClone.setInterpolator(getInterpolator()); return kfClone; } @@ -352,7 +358,13 @@ public void setValue(Object value) { @Override public FloatKeyframe clone() { - FloatKeyframe kfClone = new FloatKeyframe(getFraction(), mValue); + FloatKeyframe kfClone; + if (mHasValue) { + kfClone = new FloatKeyframe(getFraction(), mValue); + } + else { + kfClone = new FloatKeyframe(getFraction()); + } kfClone.setInterpolator(getInterpolator()); return kfClone; }