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

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

Merge "ActivityTransition: fix activity not finished on back" into lmp-dev

parents ca015d76 872efe45

core/java/android/app/EnterTransitionCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 


    private void sendSharedElementDestination() {

        boolean allReady;

        if (allowOverlappingTransitions()) {

        if (allowOverlappingTransitions() && getEnterViewsTransition() != null) {

            allReady = false;

        } else {

            allReady = !getDecor().isLayoutRequested();

core/java/android/app/ExitTransitionCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
        if (getDecor() != null) {

            getDecor().suppressLayout(true);

        }

        if (!mSharedElements.isEmpty() && getSharedElementTransition() != null) {

        if (mExitSharedElementBundle != null && !mExitSharedElementBundle.isEmpty() &&

                !mSharedElements.isEmpty() && getSharedElementTransition() != null) {

            startTransition(new Runnable() {

                public void run() {

                    startSharedElementExit();