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

Commit 04560442 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 610ac231: am fc687570: Merge "Fix no transition when only shared element exists." into lmp-dev 

* commit '610ac231a7af5d9a2e192d24b6a5f10176f6ef8b':
  Fix no transition when only shared element exists.
parents 00312cb2 0550d06d

core/java/android/app/ExitTransitionCoordinator.java

+7 −2
Original line number Diff line number Diff line
@@ -136,10 +136,11 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
        Transition transition = getSharedElementExitTransition();

        final ArrayList<View> sharedElementSnapshots = createSnapshots(mExitSharedElementBundle,

                mSharedElementNames);

        transition.addListener(new Transition.TransitionListenerAdapter() {

        transition.addListener(new ContinueTransitionListener() {

            @Override

            public void onTransitionEnd(Transition transition) {

                transition.removeListener(this);

                super.onTransitionEnd(transition);

                int count = mSharedElements.size();

                for (int i = 0; i < count; i++) {

                    View sharedElement = mSharedElements.get(i);
@@ -221,6 +222,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
        if (transition != null) {

            TransitionManager.beginDelayedTransition(getDecor(), transition);

            mTransitioningViews.get(0).invalidate();

        } else {

            transitionStarted();

        }

    }
@@ -307,6 +310,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
        if (transition != null) {

            TransitionManager.beginDelayedTransition(getDecor(), transition);

            getDecor().invalidate();

        } else {

            transitionStarted();

        }

    }