diff options
| author | Scott Main <smain@google.com> | 2011-01-17 16:06:12 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2011-01-17 16:06:12 -0800 |
| commit | 1064dd9117cb8151d301e251d6fa7cc38661817c (patch) | |
| tree | bbadb78c8d6489e1eb250be41faafe28b40a5a63 /docs | |
| parent | 3d7a9707a58bb043147f30dc81c61deeeffeeef7 (diff) | |
| download | frameworks_base-1064dd9117cb8151d301e251d6fa7cc38661817c.zip frameworks_base-1064dd9117cb8151d301e251d6fa7cc38661817c.tar.gz frameworks_base-1064dd9117cb8151d301e251d6fa7cc38661817c.tar.bz2 | |
docs: move the fragments dev guide into fundamentals topic
Change-Id: If6a9751e78db23e76256e179db99aa0e29126f85
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 6 | ||||
| -rw-r--r-- | docs/html/guide/topics/fundamentals/fragments.jd (renamed from docs/html/guide/topics/fragments/index.jd) | 0 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/actionbar.jd | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index a984acd..67f1fec 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -58,6 +58,9 @@ <span class="zh-TW" style="display:none">應用程式基本原理</span> </a></li> + <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html"> + <span class="en">Fragments</span> + </a> <span class="new">new!</span></li> </ul> <ul> <li class="toggle-list"> @@ -199,9 +202,6 @@ </li> </ul> <ul> - <li><a href="<?cs var:toroot ?>guide/topics/fragments/index.html"> - <span class="en">Fragments</span> - </a> <span class="new">new!</span></li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html"> <span class="en">Graphics</span> diff --git a/docs/html/guide/topics/fragments/index.jd b/docs/html/guide/topics/fundamentals/fragments.jd index 045a1e8..045a1e8 100644 --- a/docs/html/guide/topics/fragments/index.jd +++ b/docs/html/guide/topics/fundamentals/fragments.jd diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index 44d75c1..c17fc3c 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -53,7 +53,7 @@ href="{@docRoot}guide/topics/ui/menus.html#OptionsMenu">Options Menu</a> as "act items"—providing instant access to key user actions. (Menu items not appearing as action items are placed in the Overflow Menu, revealed by a drop-down in the Action Bar.)</li> <li>Provide tabs for navigating between <a -href="{@docRoot}guide/topics/fragments/index.html">fragments</a>.</li> +href="{@docRoot}guide/topics/fundamentals/fragments.html">fragments</a>.</li> <li>Provide drop-down navigation items.</li> <li>Provide interactive "action views" in place of action items.</li> <li>Use the application logo as a "return home" or "up" navigation action.</li> @@ -432,7 +432,7 @@ tab.</p> the state of each fragment as necessary, so when the user switches fragments with the tabs, then returns to a previous fragment, it appears the way they left. For information about saving the state of your fragment, see the <a -href="{@docRoot}guide/topics/fragments/index.html">Fragments</a> developer guide.</p> +href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> developer guide.</p> |