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

Commit d5f94468 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "API for launching activities to the side in side-by-side mode."

parents f11eca85 80e29f1c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8488,6 +8488,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_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 −0
Original line number Diff line number Diff line
@@ -8756,6 +8756,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_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 −0
Original line number Diff line number Diff line
@@ -8488,6 +8488,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_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

+7 −0
Original line number Diff line number Diff line
@@ -4432,6 +4432,13 @@ 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

     * {@link #FLAG_ACTIVITY_NEW_TASK}.

     */

    public static final int FLAG_ACTIVITY_LAUNCH_TO_SIDE = 0x00001000;



    /**

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

     * called -- no BroadcastReceiver components will be launched.

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    // Used to indicate that a task is removed it should also be removed from recents.

    private static final boolean REMOVE_FROM_RECENTS = true;

    // Used to indicate that an app transition should be animated.

    private static final boolean ANIMATE = true;

    static final boolean ANIMATE = true;















    // Determines whether to take full screen screenshots















    static final boolean TAKE_FULLSCREEN_SCREENSHOTS = true;