Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa8852510

Change-Id: I96791c05ad68a43cef0f942cd5cc1516e2dadb5b
2020-05-29 04:48:42 +00:00
parent e10361fb5e 9aa8852510
commit cd991f9b3c
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -434,7 +434,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
                mSharedElementNotified = true;
                delayCancel();

-                if (!mActivity.isTopOfTask()) {
+                if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot()
+                        && !mSharedElements.isEmpty())) {
                    mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);
                }