diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 6 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStarter.java | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt index 3260d4cc18cb..023999f51b71 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8640,7 +8640,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 diff --git a/api/system-current.txt b/api/system-current.txt index ef6506dd3f5e..fce3d4b4c201 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8954,7 +8954,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 diff --git a/api/test-current.txt b/api/test-current.txt index db1ca1990181..73315f6fba53 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index ee469dabcf43..debfa89688eb 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4587,11 +4587,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 diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index f51f689c67be..336888a61626 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -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); diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 4015c088c6e1..8a01659093ff 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -17,7 +17,7 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_TO_SIDE; +import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; @@ -1672,7 +1672,7 @@ class ActivityStarter { return mSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID, CREATE_IF_NEEDED, ON_TOP); } - if (!launchToSideAllowed || (launchFlags & FLAG_ACTIVITY_LAUNCH_TO_SIDE) == 0) { + if (!launchToSideAllowed || (launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) == 0) { return null; } |