Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e11dc0dd: Merge "Fix clone() for Animators with just a \'to\' value" into jb-mr1-dev

Browse Source 
* commit 'e11dc0ddab438d3b6545bc5d1582e1deddb5d465':
  Fix clone() for Animators with just a 'to' value
This commit is contained in:
Chet Haase
2012-09-10 13:59:22 -07:00
committed by Android Git Automerger
parent 515c34f22e e11dc0ddab
commit d8f680601d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/animation/Keyframe.java
View File

@@ -261,7 +261,7 @@ public abstract class Keyframe implements Cloneable {
@Override
public ObjectKeyframe clone() {
ObjectKeyframe kfClone = new ObjectKeyframe(getFraction(), mValue);
ObjectKeyframe kfClone = new ObjectKeyframe(getFraction(), mHasValue ? mValue : null);
kfClone.setInterpolator(getInterpolator());
return kfClone;
}
@@ -306,7 +306,9 @@ public abstract class Keyframe implements Cloneable {
@Override
public IntKeyframe clone() {
IntKeyframe kfClone = new IntKeyframe(getFraction(), mValue);
IntKeyframe kfClone = mHasValue ?
new IntKeyframe(getFraction(), mValue) :
new IntKeyframe(getFraction());
kfClone.setInterpolator(getInterpolator());
return kfClone;
}
@@ -350,7 +352,9 @@ public abstract class Keyframe implements Cloneable {
@Override
public FloatKeyframe clone() {
FloatKeyframe kfClone = new FloatKeyframe(getFraction(), mValue);
FloatKeyframe kfClone = mHasValue ?
new FloatKeyframe(getFraction(), mValue) :
new FloatKeyframe(getFraction());
kfClone.setInterpolator(getInterpolator());
return kfClone;
}