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

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

Merge "Only use return transition when requested." into tm-qpr-dev am: efff8e9f am: b1b41f18 

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



Change-Id: Ia35e92375d0305e078caaccd290357017490fbbd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc26e92b b1b41f18

core/java/android/app/ActivityTransitionState.java

+8 −1
Original line number Diff line number Diff line
@@ -145,7 +145,10 @@ class ActivityTransitionState { 
     * that it is preserved through activty destroy and restore.

     */

    private ArrayList<String> getPendingExitNames() {

        if (mPendingExitNames == null && mEnterTransitionCoordinator != null) {

        if (mPendingExitNames == null

                && mEnterTransitionCoordinator != null

                && !mEnterTransitionCoordinator.isReturning()

        ) {

            mPendingExitNames = mEnterTransitionCoordinator.getPendingExitSharedElementNames();

        }

        return mPendingExitNames;
@@ -202,6 +205,7 @@ class ActivityTransitionState { 
            restoreExitedViews();

            activity.getWindow().getDecorView().setVisibility(View.VISIBLE);

        }

        getPendingExitNames(); // Set mPendingExitNames before resetting mEnterTransitionCoordinator

        mEnterTransitionCoordinator = new EnterTransitionCoordinator(activity,

                resultReceiver, sharedElementNames, mEnterActivityOptions.isReturning(),

                mEnterActivityOptions.isCrossTask());
@@ -250,6 +254,7 @@ class ActivityTransitionState { 
    public void onStop(Activity activity) {

        restoreExitedViews();

        if (mEnterTransitionCoordinator != null) {

            getPendingExitNames(); // Set mPendingExitNames before clearing

            mEnterTransitionCoordinator.stop();

            mEnterTransitionCoordinator = null;

        }
@@ -275,6 +280,7 @@ class ActivityTransitionState { 
                        restoreReenteringViews();

                    } else if (mEnterTransitionCoordinator.isReturning()) {

                        mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                            getPendingExitNames(); // Set mPendingExitNames before clearing

                            mEnterTransitionCoordinator = null;

                        });

                    }
@@ -374,6 +380,7 @@ class ActivityTransitionState { 
    }



    public void startExitOutTransition(Activity activity, Bundle options) {

        getPendingExitNames(); // Set mPendingExitNames before clearing mEnterTransitionCoordinator

        mEnterTransitionCoordinator = null;

        if (!activity.getWindow().hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS) ||

                mExitTransitionCoordinators == null) {