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

Commit d9584c41 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update Java doc for FLAG_ACTIVITY_LAUNCH_ADJACENT" into rvc-dev am:... 

Merge "Update Java doc for FLAG_ACTIVITY_LAUNCH_ADJACENT" into rvc-dev am: 8411d737 am: a4c19e96 am: 4fb95e64 am: 235018df

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

Change-Id: I50b048e9f25953006b0e81eb7a27ddcafc7f6cd2
parents a14a77fb 235018df

core/java/android/content/Intent.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -6445,7 +6445,7 @@ public class Intent implements Parcelable, Cloneable { 
    public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 0x00002000;

    public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 0x00002000;





    /**

    /**

     * This flag is only used in split-screen multi-window mode. The new activity will be displayed

     * This flag is only used for split-screen multi-window mode. The new activity will be displayed

     * adjacent to the one launching it. This can only be used in conjunction with

     * adjacent to the one launching it. This can only be used in conjunction with

     * {@link #FLAG_ACTIVITY_NEW_TASK}. Also, setting {@link #FLAG_ACTIVITY_MULTIPLE_TASK} is

     * {@link #FLAG_ACTIVITY_NEW_TASK}. Also, setting {@link #FLAG_ACTIVITY_MULTIPLE_TASK} is

     * required if you want a new instance of an existing activity to be created.

     * required if you want a new instance of an existing activity to be created.