summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2015-01-16 17:21:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-16 17:21:32 +0000
commite8f6bd484627e16fa2fd9509b0f06056ee44be94 (patch)
treed4397eb90b2da9532f3a3810caea2ecb617c5403 /docs
parentbb600de6e7c5c7a0a1d4b872d2ee100ccc353213 (diff)
parent98f07d901492335f51258655fbfa032fa3f2d58e (diff)
downloadframeworks_base-e8f6bd484627e16fa2fd9509b0f06056ee44be94.zip
frameworks_base-e8f6bd484627e16fa2fd9509b0f06056ee44be94.tar.gz
frameworks_base-e8f6bd484627e16fa2fd9509b0f06056ee44be94.tar.bz2
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '98f07d901492335f51258655fbfa032fa3f2d58e': docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Diffstat (limited to 'docs')
-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 3c623f6..7c71e99 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -593,7 +593,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>