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

Merge "Fix ChangeTransform works only once on a View." into lmp-dev

Browse Source
This commit is contained in:
George Mount
2014-10-02 14:27:18 +00:00
committed by Android (Google) Code Review
parent 7fe95529e6 24314e7d10
commit d982b582d1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/transition/ChangeTransform.java
View File

@@ -228,7 +228,8 @@ public class ChangeTransform extends Transition {
}
// Next handle the normal matrix transform:
ObjectAnimator transformAnimator = createTransformAnimator(startValues, endValues);
ObjectAnimator transformAnimator = createTransformAnimator(startValues, endValues,
handleParentChange);
if (handleParentChange && transformAnimator != null && mUseOverlay) {
createGhostView(sceneRoot, startValues, endValues);
@@ -238,7 +239,7 @@ public class ChangeTransform extends Transition {
}
private ObjectAnimator createTransformAnimator(TransitionValues startValues,
TransitionValues endValues) {
TransitionValues endValues, final boolean handleParentChange) {
Matrix startMatrix = (Matrix) startValues.values.get(PROPNAME_MATRIX);
Matrix endMatrix = (Matrix) endValues.values.get(PROPNAME_MATRIX);
@@ -277,7 +278,12 @@ public class ChangeTransform extends Transition {
@Override
public void onAnimationEnd(Animator animation) {
if (!mIsCanceled) {
setCurrentMatrix(finalEndMatrix);
if (handleParentChange && mUseOverlay) {
setCurrentMatrix(finalEndMatrix);
} else {
view.setTagInternal(R.id.transitionTransform, null);
view.setTagInternal(R.id.parentMatrix, null);
}
}
ANIMATION_MATRIX_PROPERTY.set(view, null);
transforms.restore(view);