diff options
| -rw-r--r-- | core/java/android/app/EnterTransitionCoordinator.java | 6 | ||||
| -rw-r--r-- | core/java/android/app/ExitTransitionCoordinator.java | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index 96751dba04f4..033cffe38069 100644 --- a/core/java/android/app/EnterTransitionCoordinator.java +++ b/core/java/android/app/EnterTransitionCoordinator.java @@ -52,6 +52,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { private boolean mSharedElementTransitionStarted; private Activity mActivity; + private boolean mIsTaskRoot; private boolean mHasStopped; private boolean mIsCanceled; private ObjectAnimator mBackgroundAnimator; @@ -252,7 +253,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { cancel(); break; case MSG_ALLOW_RETURN_TRANSITION: - if (!mIsCanceled) { + if (!mIsCanceled && !mIsTaskRoot) { mPendingExitNames = mAllSharedElementNames; } break; @@ -343,6 +344,9 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { if (mActivity == null || decorView == null) { return; } + + mIsTaskRoot = mActivity.isTaskRoot(); + if (!isCrossTask()) { mActivity.overridePendingTransition(0, 0); } diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java index f7097fab6b9e..cd84e5671753 100644 --- a/core/java/android/app/ExitTransitionCoordinator.java +++ b/core/java/android/app/ExitTransitionCoordinator.java @@ -551,7 +551,7 @@ public class ExitTransitionCoordinator extends ActivityTransitionCoordinator { @Override public boolean isReturnTransitionAllowed() { - return !mActivity.isTopOfTask(); + return true; } @Override |