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

Commit f12c4de1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Added more info to FLAG_ACTIVITY_LAUNCH_ADJACENT documentation" into nyc-dev 

am: 0fbdab83

* commit '0fbdab83':
  Added more info to FLAG_ACTIVITY_LAUNCH_ADJACENT documentation
parents 99079b4f 0fbdab83

core/java/android/content/Intent.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -4560,7 +4560,8 @@ public class Intent implements Parcelable, Cloneable { 
    /**

    /**

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

     * This flag is only used in 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}.

     * {@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.

     */

     */

    public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 0x00001000;

    public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 0x00001000;