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

Commit 06cb5eda authored by Dake Gu's avatar Dake Gu Committed by Android (Google) Code Review
Browse files

Merge "Transition: Don't suppressLayout(false) for returning activity" into lmp-dev

parents ec9c7090 09d9c3be

core/java/android/app/ExitTransitionCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
        setTransitionAlpha(mTransitioningViews, 1);

        setTransitionAlpha(mSharedElements, 1);

        mIsHidden = true;

        if (getDecor() != null) {

        if (!mIsReturning && getDecor() != null) {

            getDecor().suppressLayout(false);

        }

        clearState();
@@ -357,7 +357,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
                mExitNotified = true;

                mResultReceiver.send(MSG_EXIT_TRANSITION_COMPLETE, null);

                mResultReceiver = null; // done talking

                if (getDecor() != null) {

                if (!mIsReturning && getDecor() != null) {

                    getDecor().suppressLayout(false);

                }

                finishIfNecessary();