Skip to content

Commit e11dc0d

Browse files
chethaaseAndroid (Google) Code Review
authored andcommitted
Merge "Fix clone() for Animators with just a 'to' value" into jb-mr1-dev
2 parents cae2e38 + 00177e4 commit e11dc0d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

core/java/android/animation/Keyframe.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public void setValue(Object value) {
261261

262262
@Override
263263
public ObjectKeyframe clone() {
264-
ObjectKeyframe kfClone = new ObjectKeyframe(getFraction(), mValue);
264+
ObjectKeyframe kfClone = new ObjectKeyframe(getFraction(), mHasValue ? mValue : null);
265265
kfClone.setInterpolator(getInterpolator());
266266
return kfClone;
267267
}
@@ -306,7 +306,9 @@ public void setValue(Object value) {
306306

307307
@Override
308308
public IntKeyframe clone() {
309-
IntKeyframe kfClone = new IntKeyframe(getFraction(), mValue);
309+
IntKeyframe kfClone = mHasValue ?
310+
new IntKeyframe(getFraction(), mValue) :
311+
new IntKeyframe(getFraction());
310312
kfClone.setInterpolator(getInterpolator());
311313
return kfClone;
312314
}
@@ -350,7 +352,9 @@ public void setValue(Object value) {
350352

351353
@Override
352354
public FloatKeyframe clone() {
353-
FloatKeyframe kfClone = new FloatKeyframe(getFraction(), mValue);
355+
FloatKeyframe kfClone = mHasValue ?
356+
new FloatKeyframe(getFraction(), mValue) :
357+
new FloatKeyframe(getFraction());
354358
kfClone.setInterpolator(getInterpolator());
355359
return kfClone;
356360
}

0 commit comments

Comments
 (0)