summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2015-01-16 17:14:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-16 17:14:44 +0000
commit98f07d901492335f51258655fbfa032fa3f2d58e (patch)
treeffa0f701c6cb53d7bd485e065f135b5ecdb00b00 /docs/html/guide/topics
parent74147527357b9abd9d30b3a2dbd72a5172a35625 (diff)
parent92f6a747085b4b5ed692de4bdb0050c096eae393 (diff)
downloadframeworks_base-98f07d901492335f51258655fbfa032fa3f2d58e.zip
frameworks_base-98f07d901492335f51258655fbfa032fa3f2d58e.tar.gz
frameworks_base-98f07d901492335f51258655fbfa032fa3f2d58e.tar.bz2
am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393': docs: Added info on noHistory and onActivityResult(). Bug: 13807256
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 bd1edc2..eb37b9a 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -565,7 +565,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>