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

Commit 410f7214 authored by Alexandre Elias's avatar Alexandre Elias Committed by Automerger Merge Worker
Browse files

Merge "Fix transition animation when going back twice" into sc-dev am: 4d9a0952 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I633b8092617438fea2c58462ce910587eabf58ae
parents b7bec7e7 4d9a0952

core/java/android/app/EnterTransitionCoordinator.java

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


    private boolean mSharedElementTransitionStarted;

    private Activity mActivity;

    private boolean mIsTaskRoot;

    private boolean mHasStopped;

    private boolean mIsCanceled;

    private ObjectAnimator mBackgroundAnimator;
@@ -252,7 +253,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
                cancel();

                break;

            case MSG_ALLOW_RETURN_TRANSITION:

                if (!mIsCanceled) {

                if (!mIsCanceled && !mIsTaskRoot) {

                    mPendingExitNames = mAllSharedElementNames;

                }

                break;
@@ -343,6 +344,9 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
        if (mActivity == null || decorView == null) {

            return;

        }



        mIsTaskRoot = mActivity.isTaskRoot();



        if (!isCrossTask()) {

            mActivity.overridePendingTransition(0, 0);

        }

core/java/android/app/ExitTransitionCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ public class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 


        @Override

        public boolean isReturnTransitionAllowed() {

            return !mActivity.isTopOfTask();

            return true;

        }



        @Override