Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev

Browse Source 
* commit '9096e1b2791f1feb49fb53e327de150e0e0b5e67':
  Fix javadoc attr reference.
This commit is contained in:
Jeff Sharkey
2014-08-13 20:13:06 +00:00
committed by Android Git Automerger
parent 1cae0ebdd9 437e61d5ad
commit ba8d9fa70c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/content/Intent.java
View File

@@ -3874,15 +3874,15 @@ public class Intent implements Parcelable, Cloneable {
/**
* By default a document created by {@link #FLAG_ACTIVITY_NEW_DOCUMENT} will
* have its entry in recent tasks removed when the user closes it (with back
* or however else it may finish()). If you would like to instead allow the
* or however else it may finish()). If you would like to instead allow the
* document to be kept in recents so that it can be re-launched, you can use
* this flag. When set and the task's activity is finished, the recents entry
* will remain in the interface for the user to re-launch it, like a recents
* entry for a top-level application.
*
* <p>The receiving activity can override this request with
* {@link android.R.styleable#AndroidManifestActivity_autoRemoveFromRecents}
* or by explcitly calling {@link android.app.Activity#finishAndRemoveTask()
* this flag. When set and the task's activity is finished, the recents
* entry will remain in the interface for the user to re-launch it, like a
* recents entry for a top-level application.
* <p>
* The receiving activity can override this request with
* {@link android.R.attr#autoRemoveFromRecents} or by explcitly calling
* {@link android.app.Activity#finishAndRemoveTask()
* Activity.finishAndRemoveTask()}.
*/
public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 0x00002000;