Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4e8ed71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix transition return issues when more than 1 level depth""... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I9c6c53e3941563fb32412a9b54e1f9783cabb075
parents 9129974f ba0db734

core/java/android/app/ExitTransitionCoordinator.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -434,8 +434,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
                mSharedElementNotified = true;

                mSharedElementNotified = true;

                delayCancel();

                delayCancel();





                if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot()

                if (!mActivity.isTopOfTask()) {

                        && !mSharedElements.isEmpty())) {

                    mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);

                    mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);

                }

                }