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

Commit 84afde0c authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Clone remote transition into launching options." into udc-qpr-dev

parents 4760de84 e0a1e609

core/java/android/app/ActivityOptions.java

+2 −1
Original line number Diff line number Diff line
@@ -1507,8 +1507,9 @@ public class ActivityOptions extends ComponentOptions { 
    }



    /** @hide */

    public void setRemoteTransition(@Nullable RemoteTransition remoteTransition) {

    public ActivityOptions setRemoteTransition(@Nullable RemoteTransition remoteTransition) {

        mRemoteTransition = remoteTransition;

        return this;

    }



    /** @hide */

services/core/java/com/android/server/wm/SafeActivityOptions.java

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ public class SafeActivityOptions { 
                .setPendingIntentBackgroundActivityStartMode(

                        options.getPendingIntentBackgroundActivityStartMode())

                .setPendingIntentCreatorBackgroundActivityStartMode(

                        options.getPendingIntentCreatorBackgroundActivityStartMode());

                        options.getPendingIntentCreatorBackgroundActivityStartMode())

                .setRemoteTransition(options.getRemoteTransition());

    }



    /**