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

Commit 854ed1c4 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev 

* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
  Use activity transitions when launched from fragments.
parents 7a63a3d1 1cc3e2e7

core/java/android/app/Activity.java

+8 −1
Original line number Diff line number Diff line
@@ -4194,7 +4194,11 @@ public class Activity extends ContextThemeWrapper 
     */

    public void startActivityFromFragment(@NonNull Fragment fragment, Intent intent,

            int requestCode) {

        startActivityFromFragment(fragment, intent, requestCode, null);

        Bundle options = null;

        if (mWindow.hasFeature(Window.FEATURE_CONTENT_TRANSITIONS)) {

            options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle();

        }

        startActivityFromFragment(fragment, intent, requestCode, options);

    }



    /**
@@ -4219,6 +4223,9 @@ public class Activity extends ContextThemeWrapper 
     */

    public void startActivityFromFragment(@NonNull Fragment fragment, Intent intent,

            int requestCode, @Nullable Bundle options) {

        if (options != null) {

            mActivityTransitionState.startExitOutTransition(this, options);

        }

        Instrumentation.ActivityResult ar =

            mInstrumentation.execStartActivity(

                this, mMainThread.getApplicationThread(), mToken, fragment,