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

am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev

Browse Source 
* commit '419754545ea0768a7fa715daddedef75b7b31bfa':
  Reset the transitionAlpha after the transition completes.
This commit is contained in:
George Mount
2014-11-20 15:33:13 +00:00
committed by Android Git Automerger
parent b8835791e2 419754545e
commit bf50b88ed7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,7 @@ public class ChangeTransform extends Transition {
while (outerTransition.mParent != null) { while (outerTransition.mParent != null) {
outerTransition = outerTransition.mParent; outerTransition = outerTransition.mParent;
} }
GhostListener listener = new GhostListener(view, ghostView, endMatrix); GhostListener listener = new GhostListener(view, startValues.view, ghostView);
outerTransition.addListener(listener); outerTransition.addListener(listener);
if (startValues.view != endValues.view) { if (startValues.view != endValues.view) {
@@ -466,13 +466,13 @@ public class ChangeTransform extends Transition {
private static class GhostListener extends Transition.TransitionListenerAdapter { private static class GhostListener extends Transition.TransitionListenerAdapter {
private View mView; private View mView;
private View mStartView;
private GhostView mGhostView; private GhostView mGhostView;
private Matrix mEndMatrix;
public GhostListener(View view, GhostView ghostView, Matrix endMatrix) { public GhostListener(View view, View startView, GhostView ghostView) {
mView = view; mView = view;
mStartView = startView;
mGhostView = ghostView; mGhostView = ghostView;
mEndMatrix = endMatrix;
} }
@Override @Override
@@ -481,6 +481,7 @@ public class ChangeTransform extends Transition {
GhostView.removeGhost(mView); GhostView.removeGhost(mView);
mView.setTagInternal(R.id.transitionTransform, null); mView.setTagInternal(R.id.transitionTransform, null);
mView.setTagInternal(R.id.parentMatrix, null); mView.setTagInternal(R.id.parentMatrix, null);
mStartView.setTransitionAlpha(1);
} }
@Override @Override