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

Commit c6186bff authored by George Mount's avatar George Mount
Browse files

Fix selection of epicenter in Activity Transitions. 

Bug 17393451

Change-Id: Ibbcdc104ef3193fe8ce11fa27799801ea7e73986
parent 6906771d

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);

    }