From a228d7e1b1bf719f0baf797be91a58f47b2e2800 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Tue, 17 Nov 2015 12:49:22 -0800
Subject: [PATCH] Properly remove GhostViews when Activity Transition canceled.

Bug 25744941

When the returning Activity finished without transferring the
shared element, the shared elements in the underlying Activity
were left as GhostViews. This CL transfers the shared elements
back when the shared element transition is canceled.

Change-Id: I9062f1d439bb5364ac939788c67b20a739c0627b
---
 core/java/android/app/EnterTransitionCoordinator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 07455379f5469..c0cc56678f3b3 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -248,6 +248,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
             } else if (mTransitioningViews != null) {
                 mTransitioningViews.addAll(mSharedElements);
             }
+            moveSharedElementsFromOverlay();
             mSharedElementNames.clear();
             mSharedElements.clear();
             mAllSharedElementNames.clear();