commit f451d8a6d1a454f338e37f99c0867e17ce9e06f1
author George Mount <mount@google.com> Mon Jun 23 11:09:32 2014 -0700
committer George Mount <mount@google.com> Tue Jun 24 06:57:08 2014 -0700
tree b216824af246f0accfd288fe1fc122c5fc8f96c3
parent a0a0260e48e1ee4e9b5d98b49571e8d2a6fd6c3a

Activity Transitions: Don't do a shared element exit transition twice.

Bug 15671433

Change-Id: I888702df5661c769cc1c093d859fd85e5e33d282

core/java/android/app/ExitTransitionCoordinator.java

diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 2dacb10..18a9468 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -226,13 +226,7 @@
     }
 
     private void startExitTransition() {
-        Transition sharedElementTransition = mSharedElements.isEmpty()
-                ? null : getSharedElementTransition();
-        if (sharedElementTransition == null) {
-            sharedElementTransitionComplete();
-        }
-        Transition transition = mergeTransitions(sharedElementTransition,
-                getExitTransition());
+        Transition transition = getExitTransition();
         if (transition != null) {
             TransitionManager.beginDelayedTransition(getDecor(), transition);
             setViewVisibility(mTransitioningViews, View.INVISIBLE);