commit dd725ec4a70705d5ee35c9096e9efef57f71354f
author Dake Gu <dake@google.com> Wed Sep 03 17:07:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 03 17:07:09 2014 +0000
tree 9ba81560b9b69c6b6e09baa4eee97c280871510d
parent ca015d7625ccf7510e81df35c6cf8dc24b032ebd
parent 872efe45d5b3a4d6376cd15e118d5bb68ef334da

Merge "ActivityTransition: fix activity not finished on back" into lmp-dev

core/java/android/app/EnterTransitionCoordinator.java

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 47d3fd6..73fe70f 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -170,7 +170,7 @@
 
     private void sendSharedElementDestination() {
         boolean allReady;
-        if (allowOverlappingTransitions()) {
+        if (allowOverlappingTransitions() && getEnterViewsTransition() != null) {
             allReady = false;
         } else {
             allReady = !getDecor().isLayoutRequested();

core/java/android/app/ExitTransitionCoordinator.java

diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 3760b96..f35c6e8 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -140,7 +140,8 @@
         if (getDecor() != null) {
             getDecor().suppressLayout(true);
         }
-        if (!mSharedElements.isEmpty() && getSharedElementTransition() != null) {
+        if (mExitSharedElementBundle != null && !mExitSharedElementBundle.isEmpty() &&
+                !mSharedElements.isEmpty() && getSharedElementTransition() != null) {
             startTransition(new Runnable() {
                 public void run() {
                     startSharedElementExit();