Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a8e519a3: Merge "docs: move the fragments dev guide into fundamentals topic" into honeycomb

Browse Source 
* commit 'a8e519a32291e1d964d3de71fa291d7204ef52c7':
  docs: move the fragments dev guide into fundamentals topic
This commit is contained in:
Scott Main
2011-01-17 17:04:01 -08:00
committed by Android Git Automerger
parent a2549d34c6 a8e519a322
commit eb7dbc08be
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/html/guide/guide_toc.cs
View File

@@ -58,6 +58,9 @@
<span class="zh-TW" style="display:none">應用程式基本原理</span> <span class="zh-TW" style="display:none">應用程式基本原理</span>
</a></li> </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>
<ul> <ul>
<li class="toggle-list"> <li class="toggle-list">
@@ -199,9 +202,6 @@
</li> </li>
</ul> </ul>
<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"> <li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html"> <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">
<span class="en">Graphics</span> <span class="en">Graphics</span>

0
docs/html/guide/topics/fragments/index.jd → docs/html/guide/topics/fundamentals/fragments.jd
View File

4
docs/html/guide/topics/ui/actionbar.jd
View File

@@ -53,7 +53,7 @@ href="{@docRoot}guide/topics/ui/menus.html#OptionsMenu">Options Menu</a> as "act
items"&mdash;providing instant access to key user actions. (Menu items not appearing as action items"&mdash;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> items are placed in the Overflow Menu, revealed by a drop-down in the Action Bar.)</li>
<li>Provide tabs for navigating between <a <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 drop-down navigation items.</li>
<li>Provide interactive "action views" in place of action 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> <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, 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 then returns to a previous fragment, it appears the way they left. For information about saving
the state of your fragment, see the <a 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>