commit c81af1ca7838f79ecc39fe0a9bf269880fa515e5
author George Mount <mount@google.com> Mon May 04 21:48:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 04 21:48:56 2015 +0000
tree 05ce6b7e087642d0e659ff380e17b43ed565cd43
parent 0425de31cf9a2ad8e5883c64d27dc2ee90d0377c
parent 8de1de1f0450c25ce6079f4b8674d4bb0114287e

Merge "When returning, transition only existing shared elements." into mnc-dev

core/java/android/app/ExitTransitionCoordinator.java

diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 169952ad..0f286fb 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -239,7 +239,7 @@
                 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) {