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

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

Merge "Revert "Clear mEnterTransitionCoordinator after content shows."" into... 

Merge "Revert "Clear mEnterTransitionCoordinator after content shows."" into tm-qpr-dev am: 283b8e86

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



Change-Id: Ia4ff096f62ce492762326a8ae5bfdbc24900f9be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50d6dcf9 283b8e86

core/java/android/app/ActivityTransitionState.java

+0 −10
Original line number Diff line number Diff line
@@ -263,11 +263,6 @@ class ActivityTransitionState { 
        // 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.

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

            if (mEnterTransitionCoordinator != null) {

                mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                    mEnterTransitionCoordinator = null;

                });

            }

            restoreExitedViews();

            restoreReenteringViews();

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

                    if (mEnterTransitionCoordinator == null ||

                            mEnterTransitionCoordinator.isWaitingForRemoteExit()) {

                        if (mEnterTransitionCoordinator != null) {

                            mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                                mEnterTransitionCoordinator = null;

                            });

                        }

                        restoreExitedViews();

                        restoreReenteringViews();

                    } else if (mEnterTransitionCoordinator.isReturning()) {