diff options
| author | Scott Main <smain@google.com> | 2010-04-10 11:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:48:20 -0700 |
| commit | 8e60e09219bc1bfd8a3d514db919a5f7b69fcca3 (patch) | |
| tree | 7ef5429eaa4181c78b79ef7d1476bea87de134e9 /docs/html/guide/guide_toc.cs | |
| parent | e1b462d76d9466bf89771dd0a309d8fd92e2b1de (diff) | |
| parent | 67d6590d242397acbb95814139301d2e6efd3631 (diff) | |
| download | frameworks_base-8e60e09219bc1bfd8a3d514db919a5f7b69fcca3.zip frameworks_base-8e60e09219bc1bfd8a3d514db919a5f7b69fcca3.tar.gz frameworks_base-8e60e09219bc1bfd8a3d514db919a5f7b69fcca3.tar.bz2 | |
am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken
* commit '67d6590d242397acbb95814139301d2e6efd3631':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index dce78c4..fd163f6 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -99,18 +99,36 @@ </li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html"> - <span class="en">Resources and Assets</span> + <span class="en">Application Resources</span> </a></div> <ul> - <li><a href="<?cs var:toroot ?>guide/topics/resources/resources-i18n.html"> - <span class="en">Resources and I18n</span> + <li><a href="<?cs var:toroot ?>guide/topics/resources/providing-resources.html"> + <span class="en">Providing Resources</span> </a></li> - <li><a href="<?cs var:toroot ?>guide/topics/resources/available-resources.html"> - <span class="en">Available Resource Types</span> + <li><a href="<?cs var:toroot ?>guide/topics/resources/accessing-resources.html"> + <span class="en">Accessing Resources</span> + </a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/runtime-changes.html"> + <span class="en">Handling Runtime Changes</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/resources/localization.html"> <span class="en">Localization</span> </a></li> + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>guide/topics/resources/available-resources.html"> + <span class="en">Resource Types</span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>guide/topics/resources/animation-resource.html">Animation</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/color-list-resource.html">Color State List</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/drawable-resource.html">Drawable</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/layout-resource.html">Layout</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/menu-resource.html">Menu</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/string-resource.html">String</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/style-resource.html">Style</a></li> + <li><a href="<?cs var:toroot ?>guide/topics/resources/more-resources.html">More Types</a></li> + </ul> + </li> </ul> </li> <li><a href="<?cs var:toroot ?>guide/topics/intents/intents-filters.html"> |