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

Commit 2fd9cd7c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Better handling of confused finish transition." into nyc-dev

parents 1c39a112 5ae0b7ab

core/java/android/app/ActivityTransitionState.java

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ class ActivityTransitionState { 
    }



    public boolean startExitBackTransition(final Activity activity) {

        if (mEnteringNames == null) {

        if (mEnteringNames == null || mCalledExitCoordinator != null) {

            return false;

        } else {

            if (!mHasExited) {

core/java/android/app/EnterTransitionCoordinator.java

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
                }

            };

            decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener);

            decor.invalidate();

        }

    }