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

Commit 716b33e3 authored by George Mount's avatar George Mount
Browse files

Revert "Clear mEnterTransitionCoordinator after content shows." 

This reverts commit 8aef5488.

Fixes: 239497474
Fixes: 239595736
Fixes: 240211711

Reason for revert: b/240211711 b/239595736 b/239497474

Change-Id: I3b13b49c91d38055b3e5b9d772dfe21e054911b6
parent 8aef5488

core/java/android/app/ActivityTransitionState.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -263,11 +263,6 @@ class ActivityTransitionState { 
        // After orientation change, the onResume can come in before the top Activity has

        // After orientation change, the onResume can come in before the top Activity has

        // left, so if the Activity is not top, wait a second for the top Activity to exit.

        // left, so if the Activity is not top, wait a second for the top Activity to exit.

        if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {

        if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {

            if (mEnterTransitionCoordinator != null) {

                mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                    mEnterTransitionCoordinator = null;

                });

            }

            restoreExitedViews();

            restoreExitedViews();

            restoreReenteringViews();

            restoreReenteringViews();

        } else {

        } else {
@@ -276,11 +271,6 @@ class ActivityTransitionState { 
                public void run() {

                public void run() {

                    if (mEnterTransitionCoordinator == null ||

                    if (mEnterTransitionCoordinator == null ||

                            mEnterTransitionCoordinator.isWaitingForRemoteExit()) {

                            mEnterTransitionCoordinator.isWaitingForRemoteExit()) {

                        if (mEnterTransitionCoordinator != null) {

                            mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                                mEnterTransitionCoordinator = null;

                            });

                        }

                        restoreExitedViews();

                        restoreExitedViews();

                        restoreReenteringViews();

                        restoreReenteringViews();

                    } else if (mEnterTransitionCoordinator.isReturning()) {

                    } else if (mEnterTransitionCoordinator.isReturning()) {