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

Commit 174d36d8 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Renamed FLAG_ACTIVITY_LAUNCH_TO_SIDE to FLAG_ACTIVITY_LAUNCH_ADJACENT"

parents 19021696 2a25a627

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8645,7 +8645,7 @@ package android.content { 
    field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000

    field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000

    field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000

    field public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 4096; // 0x1000

    field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000

    field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000

    field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000

    field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8959,7 +8959,7 @@ package android.content { 
    field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000

    field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000

    field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000

    field public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 4096; // 0x1000

    field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000

    field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000

    field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000

    field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8650,7 +8650,7 @@ package android.content { 
    field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000

    field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000

    field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000

    field public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 4096; // 0x1000

    field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000

    field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000

    field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000

    field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000

core/java/android/content/Intent.java

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



    /**

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

     * the other side than the one that is launching it. This can only be used in conjunction with

     * 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

     * {@link #FLAG_ACTIVITY_NEW_TASK}.

     */

    public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 0x00001000;

    public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 0x00001000;



    /**

     * If set, when sending a broadcast only registered receivers will be

packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ public class FilesActivity extends BaseActivity { 
        // By default we'd be launched in-place above the existing app.

        // By setting launch-to-side ActivityManager will open us to side.

        if (inMultiWindowMode()) {

            intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_TO_SIDE);

            intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);

        }



        startActivity(intent);