summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2011-12-16 12:07:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-16 12:07:27 -0800
commit8cffc31810a7645c70183cfb0b43c8b78a299918 (patch)
tree5a3cbddfd8ffee9202d790cb8c7486b6a470cd18
parent9edb26ea551bec24fa417a854ecec3801f15dc1d (diff)
parenta8001e2ae908c413b626a82f5ab925f18559509c (diff)
downloadframeworks_base-8cffc31810a7645c70183cfb0b43c8b78a299918.zip
frameworks_base-8cffc31810a7645c70183cfb0b43c8b78a299918.tar.gz
frameworks_base-8cffc31810a7645c70183cfb0b43c8b78a299918.tar.bz2
am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
* commit 'a8001e2ae908c413b626a82f5ab925f18559509c': docs: Add missing intent flag to Android U nav class
-rw-r--r--docs/html/training/design-navigation/ancestral-temporal.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/training/design-navigation/ancestral-temporal.jd b/docs/html/training/design-navigation/ancestral-temporal.jd
index d12fd5c..02e43e1 100644
--- a/docs/html/training/design-navigation/ancestral-temporal.jd
+++ b/docs/html/training/design-navigation/ancestral-temporal.jd
@@ -64,6 +64,6 @@ next.link=wireframing.html
<p>In some cases, it's appropriate for <em>Up</em> to perform an action rather than navigating to a parent screen. Take for example, the Gmail application for Android 3.0-based tablets. When viewing a mail conversation while holding the device in landscape, the conversation list, as well as the conversation details are presented side-by-side. This is a form of parent-child screen grouping, as discussed in a <a href="multiple-sizes.html">previous lesson</a>. However, when viewing a mail conversation in the portrait orientation, only the conversation details are shown. The <em>Up</em> button is used to temporarily show the parent pane, which slides in from the left of the screen. Pressing the <em>Up</em> button again while the left pane is visible exits the context of the individual conversation, up to a full-screen list of conversations.</p>
-<p class="note"><strong>Implementation Note:</strong> As a best practice, when implementing either <em>Home</em> or <em>Up</em>, make sure to clear the back stack of any descendent screens. For <em>Home</em>, the only remaining screen on the back stack should be the home screen. For <em>Up</em> navigation, the current screen should be removed from the back stack, unless BACK navigates across screen hierarchies. You can use the {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP} intent flag to achieve this.</p>
+<p class="note"><strong>Implementation Note:</strong> As a best practice, when implementing either <em>Home</em> or <em>Up</em>, make sure to clear the back stack of any descendent screens. For <em>Home</em>, the only remaining screen on the back stack should be the home screen. For <em>Up</em> navigation, the current screen should be removed from the back stack, unless BACK navigates across screen hierarchies. You can use the {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP} and {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK} intent flags together to achieve this.</p>
-<p>In the last lesson, we apply the concepts discussed in all of the lessons so far to create interaction design wireframes for our example news application.</p> \ No newline at end of file
+<p>In the last lesson, we apply the concepts discussed in all of the lessons so far to create interaction design wireframes for our example news application.</p>