From 8de1de1f0450c25ce6079f4b8674d4bb0114287e Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Mon, 4 May 2015 14:12:40 -0700
Subject: [PATCH] When returning, transition only existing shared elements.

Previously all shared element names were delivered when
returning from an Activity, even if no shared elements
existed in the exiting Activity. That prevented the calling
Activity from showing a shared element that it delivered,
but will not be receiving back again until shared elements
are transfered. That leaves a weird hole in the UI.

Now only the shared elements mapped in the returning view
hierarchy are delivered to the calling Activity.

Change-Id: I481a8bc7a771d7e819871f424d22313314c9ee8b
---
 core/java/android/app/ExitTransitionCoordinator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 169952ad1a0b0..0f286fb99a77b 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -239,7 +239,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
                 getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
             }
             ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, this,
-                    mAllSharedElementNames, resultCode, data);
+                    mSharedElementNames, resultCode, data);
             mActivity.convertToTranslucent(new Activity.TranslucentConversionListener() {
                 @Override
                 public void onTranslucentConversionComplete(boolean drawComplete) {