commit 68f96d8db5e5e701b6a12b5cddecc985e56a26c6
author George Mount <mount@google.com> Thu Jul 31 13:13:10 2014 -0700
committer George Mount <mount@google.com> Thu Jul 31 21:58:06 2014 +0000
tree 65ad3d754b7b7aa1f2e0c29760fc7273c500ee19
parent 73140e4df9ed9cfcc897f5cd0742b81d9839d4d4

Add differentiating transitions for returning/reentering.

Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8

core/java/android/app/EnterTransitionCoordinator.java

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 1326064..b5d362d 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -256,7 +256,7 @@
     @Override
     protected Transition getViewsTransition() {
         if (mIsReturning) {
-            return getWindow().getExitTransition();
+            return getWindow().getReenterTransition();
         } else {
             return getWindow().getEnterTransition();
         }
@@ -264,7 +264,7 @@
 
     protected Transition getSharedElementTransition() {
         if (mIsReturning) {
-            return getWindow().getSharedElementExitTransition();
+            return getWindow().getSharedElementReenterTransition();
         } else {
             return getWindow().getSharedElementEnterTransition();
         }