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

TreeHugger Robot · Android (Google) Code Review · commit 9aa885251091 · 2020-05-29T04:32:46.000Z
diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
@@ -434,7 +434,8 @@ protected void notifyComplete() {
                 mSharedElementNotified = true;
                 delayCancel();
 
-                if (!mActivity.isTopOfTask()) {
+                if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot()
+                        && !mSharedElements.isEmpty())) {
                     mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,8 @@ protected void notifyComplete() {`
`434`	`434`	`mSharedElementNotified = true;`
`435`	`435`	`delayCancel();`
`436`	`436`
`437`		`- if (!mActivity.isTopOfTask()) {`
	`437`	`+ if (!mActivity.isTopOfTask() \|\| (mIsReturning && !mActivity.isTaskRoot()`
	`438`	`+ && !mSharedElements.isEmpty())) {`
`438`	`439`	`mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);`
`439`	`440`	`}`
`440`	`441`