Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 am: ba0db734e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460 Change-Id: I22ad6b374f4f966e1fd2b02ac23caf7817bde105
2020-06-22 03:31:19 +00:00
parent 557bf2994a ba0db734e6
commit d676060146
1 changed files with 1 additions and 2 deletions
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -434,8 +434,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
                mSharedElementNotified = true;
                delayCancel();

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