summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-04-04 11:17:06 -0700
committerRicardo Cervera <rcervera@google.com>2015-01-16 09:24:30 -0800
commit97c4ba9862006e2c9f4cea07f55dc7120d305e5a (patch)
tree764f2c6ad28b9199ead3d09efa230b30701fd3eb /docs/html/guide/topics
parent3212c3aa226f8cc7cf54e72772a001906fd4d7c3 (diff)
downloadframeworks_base-97c4ba9862006e2c9f4cea07f55dc7120d305e5a.zip
frameworks_base-97c4ba9862006e2c9f4cea07f55dc7120d305e5a.tar.gz
frameworks_base-97c4ba9862006e2c9f4cea07f55dc7120d305e5a.tar.bz2
docs: Added info on noHistory and onActivityResult().
Bug: 13807256 Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83 Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
Diffstat (limited to 'docs/html/guide/topics')
-rw-r--r--docs/html/guide/topics/manifest/activity-element.jd4
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 &mdash; "{@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>