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

Commit bcd83651 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Activity Transitions: Don't do a shared element exit transition twice."

parents 1677b6b8 f451d8a6

core/java/android/app/ExitTransitionCoordinator.java

+1 −7
Original line number Diff line number Diff line
@@ -226,13 +226,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
    }



    private void startExitTransition() {

        Transition sharedElementTransition = mSharedElements.isEmpty()

                ? null : getSharedElementTransition();

        if (sharedElementTransition == null) {

            sharedElementTransitionComplete();

        }

        Transition transition = mergeTransitions(sharedElementTransition,

                getExitTransition());

        Transition transition = getExitTransition();

        if (transition != null) {

            TransitionManager.beginDelayedTransition(getDecor(), transition);

            setViewVisibility(mTransitioningViews, View.INVISIBLE);