Skip to content

Commit b2d37b3

Browse files
scottamainAndroid (Google) Code Review
scottamain
authored and
Android (Google) Code Review
committed
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
2 parents 6507df8 + a21ac88 commit b2d37b3

File tree

3 files changed

+94
-79
lines changed

3 files changed

+94
-79
lines changed

‎docs/html/guide/guide_toc.cs‎

Lines changed: 57 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ localized titles are added in the language order specified below.
88
<ul>
99

1010
<li>
11-
<h2><span class="en">Android Basics</span>
12-
<span class="de" style="display:none">Einführung in Android</span>
13-
<span class="es" style="display:none">Información básica sobre Android</span>
14-
<span class="fr" style="display:none">Présentation d'Android</span>
15-
<span class="it" style="display:none">Nozioni di base su Android</span>
16-
<span class="ja" style="display:none">Android の基本</span>
17-
<span class="zh-CN" style="display:none">Android 基础知识</span>
18-
<span class="zh-TW" style="display:none">Android 簡介</span>
19-
</h2>
11+
<span class="heading">
12+
<span class="en">Android Basics</span>
13+
<span class="de" style="display:none">Einführung in Android</span>
14+
<span class="es" style="display:none">Información básica sobre Android</span>
15+
<span class="fr" style="display:none">Présentation d'Android</span>
16+
<span class="it" style="display:none">Nozioni di base su Android</span>
17+
<span class="ja" style="display:none">Android の基本</span>
18+
<span class="zh-CN" style="display:none">Android 基础知识</span>
19+
<span class="zh-TW" style="display:none">Android 簡介</span>
20+
</span>
2021
<ul>
2122
<li><a href="<?cs var:toroot ?>guide/basics/what-is-android.html">
2223
<span class="en">What Is Android?</span>
@@ -46,7 +47,7 @@ localized titles are added in the language order specified below.
4647
</li>
4748

4849
<li>
49-
<h2>
50+
<span class="heading">
5051
<span class="en">Framework Topics</span>
5152
<span class="de" style="display:none">Framework-Themen</span>
5253
<span class="es" style="display:none">Temas sobre el framework</span>
@@ -55,7 +56,7 @@ localized titles are added in the language order specified below.
5556
<span class="ja" style="display:none">フレームワーク トピック</span>
5657
<span class="zh-CN" style="display:none">框架主题</span>
5758
<span class="zh-TW" style="display:none">架構主題</span>
58-
</h2>
59+
</span>
5960
<ul>
6061
<li class="toggle-list">
6162
<div><a href="<?cs var:toroot ?>guide/topics/fundamentals/activities.html">
@@ -443,9 +444,9 @@ localized titles are added in the language order specified below.
443444
</li>
444445

445446
<li>
446-
<h2>
447+
<span class="heading">
447448
<span class="en">Android Market Topics</span>
448-
</h2>
449+
</span>
449450
<ul>
450451
<li><a href="<?cs var:toroot ?>guide/publishing/publishing.html">
451452
<span class="en">Publishing on Android Market</span>
@@ -489,15 +490,16 @@ localized titles are added in the language order specified below.
489490

490491

491492
<li>
492-
<h2><span class="en">Developing</span>
493-
<span class="de" style="display:none">Entwicklung</span>
494-
<span class="es" style="display:none">Desarrollo</span>
495-
<span class="fr" style="display:none">Développement</span>
496-
<span class="it" style="display:none">Sviluppo</span>
497-
<span class="ja" style="display:none">開発</span>
498-
<span class="zh-CN" style="display:none">开发</span>
499-
<span class="zh-TW" style="display:none">開發</span>
500-
</h2>
493+
<span class="heading">
494+
<span class="en">Developing</span>
495+
<span class="de" style="display:none">Entwicklung</span>
496+
<span class="es" style="display:none">Desarrollo</span>
497+
<span class="fr" style="display:none">Développement</span>
498+
<span class="it" style="display:none">Sviluppo</span>
499+
<span class="ja" style="display:none">開発</span>
500+
<span class="zh-CN" style="display:none">开发</span>
501+
<span class="zh-TW" style="display:none">開發</span>
502+
</span>
501503
<ul>
502504
<!--<li><a href="">Developing for Android</a></li>
503505
signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
@@ -683,15 +685,16 @@ localized titles are added in the language order specified below.
683685
</li>
684686

685687
<li>
686-
<h2><span class="en">Publishing</span>
687-
<span class="de" style="display:none">Veröffentlichung</span>
688-
<span class="es" style="display:none">Publicación</span>
689-
<span class="fr" style="display:none">Publication</span>
690-
<span class="it" style="display:none">Pubblicazione</span>
691-
<span class="ja" style="display:none">公開</span>
692-
<span class="zh-CN" style="display:none">发布</span>
693-
<span class="zh-TW" style="display:none">發佈</span>
694-
</h2>
688+
<span class="heading">
689+
<span class="en">Publishing</span>
690+
<span class="de" style="display:none">Veröffentlichung</span>
691+
<span class="es" style="display:none">Publicación</span>
692+
<span class="fr" style="display:none">Publication</span>
693+
<span class="it" style="display:none">Pubblicazione</span>
694+
<span class="ja" style="display:none">公開</span>
695+
<span class="zh-CN" style="display:none">发布</span>
696+
<span class="zh-TW" style="display:none">發佈</span>
697+
</span>
695698
<ul>
696699
<li><a href="<?cs var:toroot ?>guide/publishing/publishing_overview.html">
697700
<span class="en">Publishing Overview</span>
@@ -733,15 +736,16 @@ localized titles are added in the language order specified below.
733736
</li>
734737

735738
<li>
736-
<h2><span class="en">Best Practices</span>
737-
<span class="de" style="display:none">Bewährte Verfahren</span>
738-
<span class="es" style="display:none">Prácticas recomendadas</span>
739-
<span class="fr" style="display:none">Meilleures pratiques</span>
740-
<span class="it" style="display:none">Best practice</span>
741-
<span class="ja" style="display:none">ベスト プラクティス</span>
742-
<span class="zh-CN" style="display:none">最佳实践</span>
743-
<span class="zh-TW" style="display:none">最佳實務</span>
744-
</h2>
739+
<span class="heading">
740+
<span class="en">Best Practices</span>
741+
<span class="de" style="display:none">Bewährte Verfahren</span>
742+
<span class="es" style="display:none">Prácticas recomendadas</span>
743+
<span class="fr" style="display:none">Meilleures pratiques</span>
744+
<span class="it" style="display:none">Best practice</span>
745+
<span class="ja" style="display:none">ベスト プラクティス</span>
746+
<span class="zh-CN" style="display:none">最佳实践</span>
747+
<span class="zh-TW" style="display:none">最佳實務</span>
748+
</span>
745749
<ul>
746750
<li><a href="<?cs var:toroot ?>guide/practices/compatibility.html">
747751
<span class="en">Compatibility</span>
@@ -837,8 +841,9 @@ localized titles are added in the language order specified below.
837841
</li>
838842

839843
<li>
840-
<h2><span class="en">Web Applications</span>
841-
</h2>
844+
<span class="heading">
845+
<span class="en">Web Applications</span>
846+
</span>
842847
<ul>
843848
<li><a href="<?cs var:toroot ?>guide/webapps/index.html">
844849
<span class="en">Web Apps Overview</span>
@@ -859,15 +864,16 @@ localized titles are added in the language order specified below.
859864
</li>
860865

861866
<li>
862-
<h2><span class="en">Appendix</span>
863-
<span class="de" style="display:none">Anhang</span>
864-
<span class="es" style="display:none">Apéndice</span>
865-
<span class="fr" style="display:none">Annexes</span>
866-
<span class="it" style="display:none">Appendice</span>
867-
<span class="ja" style="display:none">付録</span>
868-
<span class="zh-CN" style="display:none">附录</span>
869-
<span class="zh-TW" style="display:none">附錄</span>
870-
</h2>
867+
<span class="heading">
868+
<span class="en">Appendix</span>
869+
<span class="de" style="display:none">Anhang</span>
870+
<span class="es" style="display:none">Apéndice</span>
871+
<span class="fr" style="display:none">Annexes</span>
872+
<span class="it" style="display:none">Appendice</span>
873+
<span class="ja" style="display:none">付録</span>
874+
<span class="zh-CN" style="display:none">附录</span>
875+
<span class="zh-TW" style="display:none">附錄</span>
876+
</span>
871877
<ul>
872878
<li><a href="<?cs var:toroot ?>guide/appendix/api-levels.html">
873879
<span class="en">Android API Levels</span>

‎docs/html/resources/resources_toc.cs‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ul>
22
<li>
3-
<h2><span class="en">Android Training</span>
4-
</h2>
3+
<span class="heading">
4+
<span class="en">Android Training</span>
5+
</span>
56
<ul>
67

78
<li><a href="<?cs var:toroot ?>training/index.html">
@@ -237,8 +238,9 @@
237238

238239

239240
<li>
240-
<h2><span class="en">Technical Resources</span>
241-
</h2>
241+
<span class="heading">
242+
<span class="en">Technical Resources</span>
243+
</span>
242244
<ul>
243245
<li class="toggle-list">
244246
<div><a href="<?cs var:toroot ?>resources/browser.html?tag=sample">
@@ -288,15 +290,16 @@
288290
</ul>
289291
</li>
290292
<li>
291-
<h2><span class="en">Community</span>
292-
<span style="display:none" class="de"></span>
293-
<span style="display:none" class="es">Comunidad</span>
294-
<span style="display:none" class="fr">Communauté</span>
295-
<span style="display:none" class="it"></span>
296-
<span style="display:none" class="ja">コミュニティ</span>
297-
<span style="display:none" class="zh-CN">社区</span>
298-
<span style="display:none" class="zh-TW">社群</span>
299-
</h2>
293+
<span class="heading">
294+
<span class="en">Community</span>
295+
<span style="display:none" class="de"></span>
296+
<span style="display:none" class="es">Comunidad</span>
297+
<span style="display:none" class="fr">Communauté</span>
298+
<span style="display:none" class="it"></span>
299+
<span style="display:none" class="ja">コミュニティ</span>
300+
<span style="display:none" class="zh-CN">社区</span>
301+
<span style="display:none" class="zh-TW">社群</span>
302+
</span>
300303
<ul>
301304
<li><a href="<?cs var:toroot ?>resources/community-groups.html">
302305
<span class="en">Developer Forums</span>
@@ -309,8 +312,9 @@
309312
<?cs
310313
if:android.whichdoc == "online" ?>
311314
<li>
312-
<h2><span class="en">Device Dashboard</span>
313-
</h2>
315+
<span class="heading">
316+
<span class="en">Device Dashboard</span>
317+
</span>
314318
<ul>
315319
<li><a href="<?cs var:toroot ?>resources/dashboard/platform-versions.html">
316320
<span class="en">Platform Versions</span>
@@ -327,7 +331,9 @@
327331
?>
328332

329333
<li>
330-
<h2><span class="en">More</span></h2>
334+
<span class="heading">
335+
<span class="en">More</span>
336+
</span>
331337
<ul>
332338
<li><a href="<?cs var:toroot ?>resources/faq/commontasks.html">
333339
<span class="en">Common Tasks </span>

‎docs/html/sdk/sdk_toc.cs‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?cs if:!sdk.redirect ?>
22
<ul>
33
<li>
4-
<h2>
4+
<span class="heading">
55
<span class="en">Android SDK Starter Package</span>
66
<span style="display:none" class="de">Aktuelle SDK-Version</span>
77
<span style="display:none" class="es">Versión actual del SDK</span>
@@ -10,7 +10,7 @@
1010
<span style="display:none" class="ja">現在リリースされている SDK</span>
1111
<span style="display:none" class="zh-CN">当前的 SDK 版本</span>
1212
<span style="display:none" class="zh-TW">目前 SDK 發行版本</span>
13-
</h2>
13+
</span>
1414
<ul><?cs
1515
if:android.whichdoc == "online" ?>
1616
<li><a href="<?cs var:toroot ?>sdk/index.html">
@@ -37,7 +37,8 @@
3737
</ul>
3838
</li><?cs
3939
if:sdk.preview ?>
40-
<li><h2>Android 3.0 Preview SDK</h2>
40+
<li>
41+
<span class="heading">Android 3.0 Preview SDK</span>
4142
<ul>
4243
<li><a href="<?cs var:toroot ?>sdk/preview/start.html">Getting Started</a> <span
4344
class="new">new!</span></li>
@@ -46,13 +47,14 @@
4647
/if ?>
4748
<?cs
4849
if:sdk.preview ?>
49-
<li><h2>Android x.x Preview</h2>
50+
<li>
51+
<span class="heading">Android x.x Preview</span>
5052
<ul>
5153
</ul>
5254
</li><?cs
5355
/if ?>
5456
<li>
55-
<h2>
57+
<span class="heading">
5658
<span class="en">Downloadable SDK Components</span>
5759
<span style="display:none" class="de"></span>
5860
<span style="display:none" class="es"></span>
@@ -61,7 +63,7 @@
6163
<span style="display:none" class="ja"></span>
6264
<span style="display:none" class="zh-CN"></span>
6365
<span style="display:none" class="zh-TW"></span>
64-
</h2>
66+
</span>
6567
<ul>
6668
<li><a href="<?cs var:toroot ?>sdk/adding-components.html">
6769
<span class="en">Adding SDK Components</span>
@@ -158,7 +160,7 @@
158160
</ul>
159161
</li>
160162
<li>
161-
<h2>
163+
<span class="heading">
162164
<span class="en">ADT Plugin for Eclipse</span>
163165
<span style="display:none" class="de"></span>
164166
<span style="display:none" class="es"></span>
@@ -167,7 +169,7 @@
167169
<span style="display:none" class="ja"></span>
168170
<span style="display:none" class="zh-CN"></span>
169171
<span style="display:none" class="zh-TW"></span>
170-
</h2>
172+
</span>
171173
<ul>
172174
<li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 16.0.1
173175
<span style="display:none" class="de"></span>
@@ -182,15 +184,16 @@
182184
</ul>
183185
</li>
184186
<li>
185-
<h2><span class="en">Native Development Tools</span>
187+
<span class="heading">
188+
<span class="en">Native Development Tools</span>
186189
<span style="display:none" class="de"></span>
187190
<span style="display:none" class="es"></span>
188191
<span style="display:none" class="fr"></span>
189192
<span style="display:none" class="it"></span>
190193
<span style="display:none" class="ja"></span>
191194
<span style="display:none" class="zh-CN"></span>
192195
<span style="display:none" class="zh-TW"></span>
193-
</h2>
196+
</span>
194197
<ul>
195198
<li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r7</a>
196199
<span class="new">new!</span>
@@ -200,7 +203,7 @@
200203
</li>
201204

202205
<li>
203-
<h2>
206+
<span class="heading">
204207
<span class="en">More Information</span>
205208
<span style="display:none" class="de"></span>
206209
<span style="display:none" class="es"></span>
@@ -209,7 +212,7 @@
209212
<span style="display:none" class="ja"></span>
210213
<span style="display:none" class="zh-CN"></span>
211214
<span style="display:none" class="zh-TW"></span>
212-
</h2>
215+
</span>
213216
<ul>
214217
<li><a href="<?cs var:toroot ?>sdk/oem-usb.html">
215218
<span class="en">OEM USB Drivers</span>

0 commit comments

Comments
 (0)