diff options
| author | Scott Main <smain@google.com> | 2012-04-03 13:58:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-03 13:58:16 -0700 |
| commit | 0687c83032219656fa4ff64ca28dd28fd15ca748 (patch) | |
| tree | 106a2c6568cc3dafe463ea04a988239e898cf4ec | |
| parent | 04a73fb65c7fc6e8a02db98ea38ed722f60e9222 (diff) | |
| parent | 7970558e75d81edc6f26b641fe2a6a5ed4e23885 (diff) | |
| download | frameworks_base-0687c83032219656fa4ff64ca28dd28fd15ca748.zip frameworks_base-0687c83032219656fa4ff64ca28dd28fd15ca748.tar.gz frameworks_base-0687c83032219656fa4ff64ca28dd28fd15ca748.tar.bz2 | |
Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 21 | ||||
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 13 |
2 files changed, 16 insertions, 18 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index ec87de8..ba8dc5e 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -90,21 +90,20 @@ <ul> <li> <a href="<?cs var:toroot ?>guide/topics/providers/content-provider-basics.html"> - <span class="en">Content Provider Basics</span> + <span class="en">Content Provider Basics<span +class="new"> new!</span></span> </a> - <span class="new">new!</span> </li> <li> <a href="<?cs var:toroot ?>guide/topics/providers/content-provider-creating.html"> - <span class="en">Creating a Content Provider</span> + <span class="en">Creating a Content Provider<span +class="new"> new!</span></span> </a> - <span class="new">new!</span> </li> <li> <a href="<?cs var:toroot ?>guide/topics/providers/calendar-provider.html"> - <span class="en">Calendar Provider</span> + <span class="en">Calendar Provider<span class="new"> new!</span></span> </a> - <span class="new">new!</span> </li> </ul> </li> @@ -130,8 +129,8 @@ <span class="en">Input Events</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html"> - <span class="en">Menus</span> - </a> <span class="new">updated</span></li> + <span class="en">Menus<span class="new"> new!</span></span> + </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/actionbar.html"> <span class="en">Action Bar</span> </a></li> @@ -162,8 +161,7 @@ </a></li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/ui/accessibility/index.html"> - <span class="en">Accessibility</span> - <span class="new">new!</span> + <span class="en">Accessibility<span class="new"> new!</span></span> </a></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/ui/accessibility/apps.html"> @@ -514,8 +512,7 @@ <span class="en">Multiple APK Support</span></a> </li> <li><a href="<?cs var:toroot ?>guide/market/expansion-files.html"> - <span class="en">APK Expansion Files</span></a> - <span class="new">new!</span> + <span class="en">APK Expansion Files<span class="new"> new!</span></span></a> </li> </ul> </li> diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index f003e75..e4ab16f 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -100,8 +100,9 @@ <li class="toggle-list"> <div><a href="<?cs var:toroot ?>training/efficient-downloads/index.html"> - <span class="en">Transferring Data Without Draining the Battery</span> - </a> <span class="new">new!</span></div> + <span class="en">Transferring Data Without Draining the Battery<span +class="new"> new!</span></span> + </a></div> <ul> <li><a href="<?cs var:toroot ?>training/efficient-downloads/efficient-network-access.html"> <span class="en">Optimizing Downloads for Efficient Network Access</span> @@ -124,8 +125,8 @@ <li class="toggle-list"> <div><a href="<?cs var:toroot ?>training/search/index.html"> - <span class="en">Adding Search Functionality</span> - </a> <span class="new">new!</span> + <span class="en">Adding Search Functionality<span class="new"> new!</span></span> + </a> </div> <ul> <li><a href="<?cs var:toroot ?>training/search/setup.html"> @@ -281,8 +282,8 @@ <li class="toggle-list"> <div><a href="<?cs var:toroot ?>training/accessibility/index.html"> - <span class="en">Implementing Accessibility</span> - </a> <span class="new">new!</span></div> + <span class="en">Implementing Accessibility<span class="new"> new!</span></span> + </a></div> <ul> <li><a href="<?cs var:toroot ?>training/accessibility/accessible-app.html"> <span class="en">Developing Accessible Applications</span> |