From c6186bffe477b996e388046e8761908b813fd07f Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 4 Sep 2014 16:33:59 -0700
Subject: Fix selection of epicenter in Activity Transitions.

Bug 17393451

Change-Id: Ibbcdc104ef3193fe8ce11fa27799801ea7e73986
---
 core/java/android/app/ActivityTransitionCoordinator.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java
index a09a2e7d090c..3dd494e82647 100644
--- a/core/java/android/app/ActivityTransitionCoordinator.java
+++ b/core/java/android/app/ActivityTransitionCoordinator.java
@@ -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);
     }
-- 
cgit v1.2.3-59-g8ed1b