diff options
author | Scott Main <smain@google.com> | 2012-01-09 17:36:46 -0800 |
---|---|---|
committer | Scott Main <smain@google.com> | 2012-01-10 14:19:19 -0800 |
commit | eb5dacddc443db0752529a69a9c48dab1b129a18 (patch) | |
tree | 33c6384440f9c1c756795a2efa9f8a9951b189f0 /docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd | |
parent | 7944704e6c4cc10105838b78d3d8403bf66a066b (diff) | |
download | frameworks_base-eb5dacddc443db0752529a69a9c48dab1b129a18.zip frameworks_base-eb5dacddc443db0752529a69a9c48dab1b129a18.tar.gz frameworks_base-eb5dacddc443db0752529a69a9c48dab1b129a18.tar.bz2 |
docs: add links to Android Design from dev docs
Change-Id: Ib2334be0a05d33008d2e4850547ff1c3b7b16764
Diffstat (limited to 'docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd')
-rw-r--r-- | docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd index 5a1f7a2..086ba71 100644 --- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd +++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd @@ -34,7 +34,9 @@ to perform other tasks without losing their work</li> <h2>See also</h2> <ol> - <li><a><a href="{@docRoot}videos/index.html#v=fL6gSd4ugSI">Application Lifecycle video</a></li> + <li><a href="{@docRoot}design/patterns/navigation.html">Android Design: +Navigation</a></li> + <li><a href="{@docRoot}videos/index.html#v=fL6gSd4ugSI">Application Lifecycle video</a></li> <li><a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>} manifest element</a></li> @@ -172,6 +174,13 @@ destroyed. The previous activity in the stack is resumed. When an activity is de </ul> +<div class="design-announce"> +<p><strong>Navigation Design</strong></p> + <p>For more about how app navigation works on Android, read Android Design's <a +href="{@docRoot}design/patterns/navigation.html">Navigation</a> guide.</p> +</div> + + <h2 id="ActivityState">Saving Activity State</h2> <p>As discussed above, the system's default behavior preserves the state of an activity when it is |