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

Commit d0569c60 authored by wilsonshih's avatar wilsonshih
Browse files

Clone remote transition into launching options. 

So the remote transition can pass to TransitionRequestInfo while
startActivities. Although there might be multiple transition request
for startActivities, but the rest of transition should be merged into
the first transition, so the remote transition should only be used once

Bug: 298975791
Test: Launch app where will start with startActivities from
notification, verify the transition should be handled by remote
transition.

Change-Id: I1e7ebfe9515a94bd3989d2d35f639c4aa3943617
parent 0283bc86

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

    }



    /**