Skip to content
This repository was archived by the owner on Apr 19, 2018. It is now read-only.

correctly clone keyframe with no value #62

Open
farfromrefug wants to merge 1 commit into
base: master
Choose a base branch
from
Open

correctly clone keyframe with no value #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions library/src/com/nineoldandroids/animation/Keyframe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down