diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 20:06:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 20:06:53 +0000 |
| commit | 23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5 (patch) | |
| tree | 5db60d3ced0542b92be52f5cfe60bdb21288de7a /docs/html/guide | |
| parent | c952235d9f0539a1d76e82944b51e2f8a4fa6ef3 (diff) | |
| parent | 1e59b338e6d1a270947908e53cefd088e2e38fb3 (diff) | |
| download | frameworks_base-23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5.zip frameworks_base-23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5.tar.gz frameworks_base-23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5.tar.bz2 | |
am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
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> |