diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 09:54:30 -0800 |
|---|---|---|
| committer | Ricardo Cervera <rcervera@google.com> | 2015-01-16 09:54:30 -0800 |
| commit | 93f94c2ca5bf23533fc5a9bd70a4795584d20618 (patch) | |
| tree | 764f2c6ad28b9199ead3d09efa230b30701fd3eb /docs/html/guide | |
| parent | 3212c3aa226f8cc7cf54e72772a001906fd4d7c3 (diff) | |
| parent | e8f6bd484627e16fa2fd9509b0f06056ee44be94 (diff) | |
| download | frameworks_base-93f94c2ca5bf23533fc5a9bd70a4795584d20618.zip frameworks_base-93f94c2ca5bf23533fc5a9bd70a4795584d20618.tar.gz frameworks_base-93f94c2ca5bf23533fc5a9bd70a4795584d20618.tar.bz2 | |
resolved conflicts for merge of e8f6bd48 to lmp-dev
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 7374a67..c1256f9 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -686,7 +686,9 @@ visible on screen — "{@code true}" if it should be finished, and <p> A value of "{@code true}" means that the activity will not leave a historical trace. It will not remain in the activity stack for the task, -so the user will not be able to return to it. +so the user will not be able to return to it. In this case, +{@link android.app.Activity#onActivityResult onActivityResult()} is never called if you +start another activity for a result from this activity. </p> <p> |