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

Commit 064aa25d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove TransitionListener after transition completes."

parents 434523b9 25f98a4c

core/java/android/app/ActivityTransitionCoordinator.java

+5 −0
Original line number Diff line number Diff line
@@ -924,6 +924,11 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
                startTransition(pending);

            }

        }



        @Override

        public void onTransitionEnd(Transition transition) {

            transition.removeListener(this);

        }

    }



    private static int scaleTypeToInt(ImageView.ScaleType scaleType) {

core/java/android/app/ExitTransitionCoordinator.java

+1 −2
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
            viewsTransition.addListener(new ContinueTransitionListener() {

                @Override

                public void onTransitionEnd(Transition transition) {

                    transition.removeListener(this);

                    viewsTransitionComplete();

                    if (mIsHidden && transitioningViews != null) {

                        showViews(transitioningViews, true);
@@ -354,11 +353,11 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
            sharedElementTransition.addListener(new ContinueTransitionListener() {

                @Override

                public void onTransitionEnd(Transition transition) {

                    transition.removeListener(this);

                    sharedElementTransitionComplete();

                    if (mIsHidden) {

                        showViews(mSharedElements, true);

                    }

                    super.onTransitionEnd(transition);

                }

            });

            mSharedElements.get(0).invalidate();

core/java/android/transition/ChangeBounds.java

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ public class ChangeBounds extends Transition { 
                            if (!mCanceled) {

                                parent.suppressLayout(false);

                            }

                            transition.removeListener(this);

                        }



                        @Override

core/java/android/transition/ChangeText.java

+5 −0
Original line number Diff line number Diff line
@@ -291,6 +291,11 @@ public class ChangeText extends Transition { 
                        view.setTextColor(mPausedColor);

                    }

                }



                @Override

                public void onTransitionEnd(Transition transition) {

                    transition.removeListener(this);

                }

            };

            addListener(transitionListener);

            if (DBG) {

core/java/android/transition/Fade.java

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public class Fade extends Visibility { 
            @Override

            public void onTransitionEnd(Transition transition) {

                view.setTransitionAlpha(1);

                transition.removeListener(this);

            }

        });

        return anim;