commit ffd09aed4e31cc52d273ce0280488c38547866b2
author George Mount <mount@google.com> Fri Sep 05 14:14:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 14:14:53 2014 +0000
tree 6ec2de0ca5503fbef6e15aa2a643b5efaf8f4597
parent c2d66a0282854fc80ec9525e54d2335e6b055923
parent c6186bffe477b996e388046e8761908b813fd07f

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

core/java/android/app/ActivityTransitionCoordinator.java

diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java
index 5e0ea17..9e80a4b 100644
--- a/core/java/android/app/ActivityTransitionCoordinator.java
+++ b/core/java/android/app/ActivityTransitionCoordinator.java
@@ -251,9 +251,11 @@
      */
     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);
     }