commit 5ae0b7abf0d026973d556a8d6685dc2b986bf7b5
author George Mount <mount@google.com> Tue May 31 12:58:52 2016 -0700
committer George Mount <mount@google.com> Tue May 31 12:58:52 2016 -0700
tree 1b9c1f1e8d97f72c1d6faaa5d99d5d2305dad265
parent c26b8afd35c2debf14cdefb6120b908cfb9ef5c3

Better handling of confused finish transition.

Bug 28347277

When an activity calls startActivity with makeSceneTransitionAnimation
and then calls finishAfterTransition, it should not do any transition
and just finish.

Change-Id: I00e537638fa6f24c95605f09bbafd843b569bb4d

core/java/android/app/ActivityTransitionState.java

diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java
index 4a1aff7..02eb4d3 100644
--- a/core/java/android/app/ActivityTransitionState.java
+++ b/core/java/android/app/ActivityTransitionState.java
@@ -284,7 +284,7 @@
     }
 
     public boolean startExitBackTransition(final Activity activity) {
-        if (mEnteringNames == null) {
+        if (mEnteringNames == null || mCalledExitCoordinator != null) {
             return false;
         } else {
             if (!mHasExited) {

core/java/android/app/EnterTransitionCoordinator.java

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index a599584..8bf1e9a 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -150,6 +150,7 @@
                 }
             };
             decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener);
+            decor.invalidate();
         }
     }