Merge "Properly remove GhostViews when Activity Transition canceled."

2015-11-18 15:37:39 +00:00
parent 98c204ada8 a228d7e1b1
commit c36bab34b6
1 changed files with 1 additions and 0 deletions
--- 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();