summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorAndrew Solovay <asolovay@google.com>2014-07-22 18:59:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-18 22:16:50 +0000
commiteb69126c613dfd476fa516df6ae1c2d78e445f0b (patch)
tree53de6de8a082fd3ed02f7b50829c6ada27fa9223 /docs/html/training
parent170556f82bd009cf5a74a53d7ba61221d74d36e9 (diff)
parent8e4ff7fee78a7193ac09bcd745c5900eef99cab7 (diff)
downloadframeworks_base-eb69126c613dfd476fa516df6ae1c2d78e445f0b.zip
frameworks_base-eb69126c613dfd476fa516df6ae1c2d78e445f0b.tar.gz
frameworks_base-eb69126c613dfd476fa516df6ae1c2d78e445f0b.tar.bz2
Merge "DO NOT MERGE" into klp-modular-docs
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/implementing-navigation/ancestral.jd21
1 files changed, 19 insertions, 2 deletions
diff --git a/docs/html/training/implementing-navigation/ancestral.jd b/docs/html/training/implementing-navigation/ancestral.jd
index 12d5005..f4d7c1a 100644
--- a/docs/html/training/implementing-navigation/ancestral.jd
+++ b/docs/html/training/implementing-navigation/ancestral.jd
@@ -133,7 +133,25 @@ android.support.v4.app.NavUtils} class's static method,
navigateUpFromSameTask()}. When you call this method, it finishes the current activity and
starts (or resumes) the appropriate parent activity.
If the target parent activity is in the task's back stack, it is brought
-forward as defined by {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP}.</p>
+forward. The way it is brought forward depends on whether the parent activity
+is able to handle an {@link
+android.app.Activity#onNewIntent onNewIntent()} call:</p>
+
+<ul>
+ <li>If the parent activity has launch mode <a
+ href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
+ &lt;singleTop>}</a>, or the <code>up</code> intent contains {@link
+ android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP}, the parent activity is
+ brought to the top of the stack, and receives the intent through its
+ {@link android.app.Activity#onNewIntent onNewIntent()} method.</li>
+
+ <li>If the parent activity has launch mode <a
+ href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code
+ &lt;standard>}</a>, and the <code>up</code> intent does not contain
+ {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP}, the parent activity
+ is popped off the stack, and a new instance of that activity is created on
+ top of the stack to receive the intent.</li>
+</ul>
<p>For example:</p>
@@ -157,7 +175,6 @@ activity was started in a task that belongs to a different app, then
navigating <em>Up</em> should create a new task that belongs to your app, which
requires that you create a new back stack.</p>
-
<h3 id="BuildBackStack">Navigate up with a new back stack</h3>
<p>If your activity provides any <a