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

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

Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev

parents c2d66a02 c6186bff

core/java/android/app/ActivityTransitionCoordinator.java

+5 −3
Original line number Diff line number Diff line
@@ -251,9 +251,11 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
     */

    protected void setEpicenter() {

        View epicenter = null;

        if (!mAllSharedElementNames.isEmpty() && !mSharedElementNames.isEmpty() &&

                mAllSharedElementNames.get(0).equals(mSharedElementNames.get(0))) {

            epicenter = mSharedElements.get(0);

        if (!mAllSharedElementNames.isEmpty() && !mSharedElementNames.isEmpty()) {

            int index = mSharedElementNames.indexOf(mAllSharedElementNames.get(0));

            if (index >= 0) {

                epicenter = mSharedElements.get(index);

            }

        }

        setEpicenter(epicenter);

    }