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

Commit cf653fa8 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7c 

am: 27a0e5a6

* commit '27a0e5a6':
  Better handling of confused finish transition.

Change-Id: I0da6175da030570bd26117f1cd1e33a7ddf2c51d
parents f864ebdd 27a0e5a6

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();

        }

    }