commit efc1799234e37aae81a3dd9b3298c62167570279
author George Mount <mount@google.com> Fri Sep 05 15:45:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 15:45:08 2014 +0000
tree 77c91686cf1cdb95b712bb0c071e4a7f9790dcaa
parent 3ea1ea4683ef2e10714966e9c23f53d7304fa843
parent 88582621bd21ef824ef658bcef821884ce2637cb

am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev

* commit '86d466b324a31117e5da230b04f165b3b1fa4665':
  Fix selection of epicenter in Activity Transitions.

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