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

Commit 95a3bc9f authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Clone remote transition into launching options." into udc-qpr-dev am: 84afde0c 

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



Change-Id: I4d35c9b9997dd4e83b33c3d9af71b066dcbb6064
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57073d41 84afde0c

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());

    }



    /**