Skip to content

Commit 2449b2e

Browse files
scottamainAndroid Git Automerger
authored andcommitted
am 0687c83: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1
* commit '0687c83032219656fa4ff64ca28dd28fd15ca748': docs: change markup for "new" tags to avoid the new tags wraping solo
2 parents 274fb3c + 0687c83 commit 2449b2e

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

docs/html/guide/guide_toc.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,20 @@ localized titles are added in the language order specified below.
9090
<ul>
9191
<li>
9292
<a href="<?cs var:toroot ?>guide/topics/providers/content-provider-basics.html">
93-
<span class="en">Content Provider Basics</span>
93+
<span class="en">Content Provider Basics<span
94+
class="new">&nbsp;new!</span></span>
9495
</a>
95-
<span class="new">new!</span>
9696
</li>
9797
<li>
9898
<a href="<?cs var:toroot ?>guide/topics/providers/content-provider-creating.html">
99-
<span class="en">Creating a Content Provider</span>
99+
<span class="en">Creating a Content Provider<span
100+
class="new">&nbsp;new!</span></span>
100101
</a>
101-
<span class="new">new!</span>
102102
</li>
103103
<li>
104104
<a href="<?cs var:toroot ?>guide/topics/providers/calendar-provider.html">
105-
<span class="en">Calendar Provider</span>
105+
<span class="en">Calendar Provider<span class="new">&nbsp;new!</span></span>
106106
</a>
107-
<span class="new">new!</span>
108107
</li>
109108
</ul>
110109
</li>
@@ -130,8 +129,8 @@ localized titles are added in the language order specified below.
130129
<span class="en">Input Events</span>
131130
</a></li>
132131
<li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html">
133-
<span class="en">Menus</span>
134-
</a> <span class="new">updated</span></li>
132+
<span class="en">Menus<span class="new">&nbsp;new!</span></span>
133+
</a></li>
135134
<li><a href="<?cs var:toroot ?>guide/topics/ui/actionbar.html">
136135
<span class="en">Action Bar</span>
137136
</a></li>
@@ -162,8 +161,7 @@ localized titles are added in the language order specified below.
162161
</a></li>
163162
<li class="toggle-list">
164163
<div><a href="<?cs var:toroot ?>guide/topics/ui/accessibility/index.html">
165-
<span class="en">Accessibility</span>
166-
<span class="new">new!</span>
164+
<span class="en">Accessibility<span class="new">&nbsp;new!</span></span>
167165
</a></div>
168166
<ul>
169167
<li><a href="<?cs var:toroot ?>guide/topics/ui/accessibility/apps.html">
@@ -514,8 +512,7 @@ localized titles are added in the language order specified below.
514512
<span class="en">Multiple APK Support</span></a>
515513
</li>
516514
<li><a href="<?cs var:toroot ?>guide/market/expansion-files.html">
517-
<span class="en">APK Expansion Files</span></a>
518-
<span class="new">new!</span>
515+
<span class="en">APK Expansion Files<span class="new">&nbsp;new!</span></span></a>
519516
</li>
520517
</ul>
521518
</li>

docs/html/resources/resources_toc.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@
100100

101101
<li class="toggle-list">
102102
<div><a href="<?cs var:toroot ?>training/efficient-downloads/index.html">
103-
<span class="en">Transferring Data Without Draining the Battery</span>
104-
</a> <span class="new">new!</span></div>
103+
<span class="en">Transferring Data Without Draining the Battery<span
104+
class="new">&nbsp;new!</span></span>
105+
</a></div>
105106
<ul>
106107
<li><a href="<?cs var:toroot ?>training/efficient-downloads/efficient-network-access.html">
107108
<span class="en">Optimizing Downloads for Efficient Network Access</span>
@@ -124,8 +125,8 @@
124125

125126
<li class="toggle-list">
126127
<div><a href="<?cs var:toroot ?>training/search/index.html">
127-
<span class="en">Adding Search Functionality</span>
128-
</a> <span class="new">new!</span>
128+
<span class="en">Adding Search Functionality<span class="new">&nbsp;new!</span></span>
129+
</a>
129130
</div>
130131
<ul>
131132
<li><a href="<?cs var:toroot ?>training/search/setup.html">
@@ -281,8 +282,8 @@
281282

282283
<li class="toggle-list">
283284
<div><a href="<?cs var:toroot ?>training/accessibility/index.html">
284-
<span class="en">Implementing Accessibility</span>
285-
</a> <span class="new">new!</span></div>
285+
<span class="en">Implementing Accessibility<span class="new">&nbsp;new!</span></span>
286+
</a></div>
286287
<ul>
287288
<li><a href="<?cs var:toroot ?>training/accessibility/accessible-app.html">
288289
<span class="en">Developing Accessible Applications</span>

0 commit comments

Comments
 (0)