diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-15 18:37:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-15 16:05:04 +0000 |
| commit | 00e7ba05ac2c6b17005ef9cd61d49c595c899aa9 (patch) | |
| tree | 56fd28ce2895dcc75600125b25a8de7e415145c9 /core/java/android/content | |
| parent | 4d922e6f7452d30f2f6085a292cf261d62a1de02 (diff) | |
| parent | bb742462781a73bb25516067c8fe6311c1c8a93e (diff) | |
| download | frameworks_base-00e7ba05ac2c6b17005ef9cd61d49c595c899aa9.zip frameworks_base-00e7ba05ac2c6b17005ef9cd61d49c595c899aa9.tar.gz frameworks_base-00e7ba05ac2c6b17005ef9cd61d49c595c899aa9.tar.bz2 | |
Merge "Launch activity behind launching task." into lmp-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Intent.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 4153a02..5bf8a97 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3809,17 +3809,6 @@ public class Intent implements Parcelable, Cloneable { * {@link android.R.styleable#AndroidManifestActivity_autoRemoveFromRecents}. */ public static final int FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS = 0x00002000; - /** - * If set along with FLAG_ACTIVITY_NEW_DOCUMENT then the task being launched will not be - * presented to the user but will instead be only available through the recents task list. - * In addition, the new task wil be affiliated with the launching activity's task. - * Affiliated tasks are grouped together in the recents task list. - * - * <p>This behavior is not supported for activities with {@link - * android.R.styleable#AndroidManifestActivity_launchMode launchMode} values of - * <code>singleInstance</code> or <code>singleTask</code>. - */ - public static final int FLAG_ACTIVITY_LAUNCH_BEHIND = 0x00001000; /** * If set, when sending a broadcast only registered receivers will be |