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

Commit a8bd9294 authored by George Mount's avatar George Mount
Browse files

Use activity transitions when launched from fragments.

Bug 15118249

Change-Id: I4e6a5dc6c930828a54a855d7b580a1bbc591ece5
parent a06d76b1
Loading
Loading
Loading
Loading
+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,