Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b986f82c authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

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

automerge: bf50b88e

* commit 'bf50b88e':
  Reset the transitionAlpha after the transition completes.
parents e8a4055a bf50b88e

core/java/android/transition/ChangeTransform.java

+5 −4
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ public class ChangeTransform extends Transition { 
        while (outerTransition.mParent != null) {

            outerTransition = outerTransition.mParent;

        }

        GhostListener listener = new GhostListener(view, ghostView, endMatrix);

        GhostListener listener = new GhostListener(view, startValues.view, ghostView);

        outerTransition.addListener(listener);



        if (startValues.view != endValues.view) {
@@ -466,13 +466,13 @@ public class ChangeTransform extends Transition { 


    private static class GhostListener extends Transition.TransitionListenerAdapter {

        private View mView;

        private View mStartView;

        private GhostView mGhostView;

	private Matrix mEndMatrix;



        public GhostListener(View view, GhostView ghostView, Matrix endMatrix) {

        public GhostListener(View view, View startView, GhostView ghostView) {

            mView = view;

            mStartView = startView;

            mGhostView = ghostView;

            mEndMatrix = endMatrix;

        }



        @Override
@@ -481,6 +481,7 @@ public class ChangeTransform extends Transition { 
            GhostView.removeGhost(mView);

            mView.setTagInternal(R.id.transitionTransform, null);

            mView.setTagInternal(R.id.parentMatrix, null);

            mStartView.setTransitionAlpha(1);

        }



        @Override