Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed1472db authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for... 

am b2d37b39: 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

* commit 'b2d37b39':
  docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
parents b4c59c32 b2d37b39

docs/html/guide/guide_toc.cs

+57 −51
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
<ul>



  <li>

    <h2><span class="en">Android Basics</span>

    <span class="heading">

      <span class="en">Android Basics</span>

      <span class="de" style="display:none">Einführung in Android</span>

      <span class="es" style="display:none">Información básica sobre Android</span>

      <span class="fr" style="display:none">Présentation d'Android</span>
@@ -16,7 +17,7 @@ 
      <span class="ja" style="display:none">Android の基本</span>

      <span class="zh-CN" style="display:none">Android 基础知识</span>

      <span class="zh-TW" style="display:none">Android 簡介</span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>guide/basics/what-is-android.html">

        <span class="en">What Is Android?</span>
@@ -46,7 +47,7 @@ 
  </li>



  <li>

    <h2>

    <span class="heading">

      <span class="en">Framework Topics</span>

      <span class="de" style="display:none">Framework-Themen</span>

      <span class="es" style="display:none">Temas sobre el framework</span>
@@ -55,7 +56,7 @@ 
      <span class="ja" style="display:none">フレームワーク トピック</span>

      <span class="zh-CN" style="display:none">框架主题</span>

      <span class="zh-TW" style="display:none">架構主題</span>

    </h2>

    </span>

    <ul>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/fundamentals/activities.html">
@@ -443,9 +444,9 @@ 
  </li>



  <li>

    <h2>

    <span class="heading">

      <span class="en">Android Market Topics</span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>guide/publishing/publishing.html">

          <span class="en">Publishing on Android Market</span>
@@ -489,7 +490,8 @@ 




  <li>

    <h2><span class="en">Developing</span>

    <span class="heading">

      <span class="en">Developing</span>

      <span class="de" style="display:none">Entwicklung</span>

      <span class="es" style="display:none">Desarrollo</span>

      <span class="fr" style="display:none">Développement</span>
@@ -497,7 +499,7 @@ 
      <span class="ja" style="display:none">開発</span>

      <span class="zh-CN" style="display:none">开发</span>

      <span class="zh-TW" style="display:none">開發</span>

    </h2>

    </span>

    <ul>

  <!--<li><a href="">Developing for Android</a></li>

      signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
@@ -683,7 +685,8 @@ 
  </li>



  <li>

    <h2><span class="en">Publishing</span>

    <span class="heading">

      <span class="en">Publishing</span>

      <span class="de" style="display:none">Veröffentlichung</span>

      <span class="es" style="display:none">Publicación</span>

      <span class="fr" style="display:none">Publication</span>
@@ -691,7 +694,7 @@ 
      <span class="ja" style="display:none">公開</span>

      <span class="zh-CN" style="display:none">发布</span>

      <span class="zh-TW" style="display:none">發佈</span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>guide/publishing/publishing_overview.html">

            <span class="en">Publishing Overview</span>
@@ -733,7 +736,8 @@ applications</span> 
  </li>



  <li>

    <h2><span class="en">Best Practices</span>

    <span class="heading">

      <span class="en">Best Practices</span>

      <span class="de" style="display:none">Bewährte Verfahren</span>

      <span class="es" style="display:none">Prácticas recomendadas</span>

      <span class="fr" style="display:none">Meilleures pratiques</span>
@@ -741,7 +745,7 @@ applications</span> 
      <span class="ja" style="display:none">ベスト プラクティス</span>

      <span class="zh-CN" style="display:none">最佳实践</span>

      <span class="zh-TW" style="display:none">最佳實務</span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>guide/practices/compatibility.html">

            <span class="en">Compatibility</span>
@@ -837,8 +841,9 @@ applications</span> 
  </li>



  <li>

    <h2><span class="en">Web Applications</span>

    </h2>

    <span class="heading">

      <span class="en">Web Applications</span>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>guide/webapps/index.html">

            <span class="en">Web Apps Overview</span>
@@ -859,7 +864,8 @@ applications</span> 
  </li>



  <li>

    <h2><span class="en">Appendix</span>

    <span class="heading">

      <span class="en">Appendix</span>

      <span class="de" style="display:none">Anhang</span>

      <span class="es" style="display:none">Apéndice</span>

      <span class="fr" style="display:none">Annexes</span>
@@ -867,7 +873,7 @@ applications</span> 
      <span class="ja" style="display:none">付録</span>

      <span class="zh-CN" style="display:none">附录</span>

      <span class="zh-TW" style="display:none">附錄</span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>guide/appendix/api-levels.html">

            <span class="en">Android API Levels</span>

docs/html/resources/resources_toc.cs

+22 −16
Original line number Diff line number Diff line 
<ul>

  <li>

    <h2><span class="en">Android Training</span>

    </h2>

    <span class="heading">

      <span class="en">Android Training</span>

    </span>

    <ul>

      

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

      

  <li>

    <h2><span class="en">Technical Resources</span>

    </h2>

    <span class="heading">

      <span class="en">Technical Resources</span>

    </span>

    <ul>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>resources/browser.html?tag=sample">
@@ -288,7 +290,8 @@ 
    </ul>

  </li>

  <li>

    <h2><span class="en">Community</span>

    <span class="heading">

      <span class="en">Community</span>

      <span style="display:none" class="de"></span>

      <span style="display:none" class="es">Comunidad</span>

      <span style="display:none" class="fr">Communauté</span>
@@ -296,7 +299,7 @@ 
      <span style="display:none" class="ja">コミュニティ</span>

      <span style="display:none" class="zh-CN">社区</span>

      <span style="display:none" class="zh-TW">社群</span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>resources/community-groups.html">

            <span class="en">Developer Forums</span>
@@ -309,8 +312,9 @@ 
<?cs

  if:android.whichdoc == "online" ?>

  <li>

    <h2><span class="en">Device Dashboard</span>

    </h2>

    <span class="heading">

      <span class="en">Device Dashboard</span>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>resources/dashboard/platform-versions.html">

            <span class="en">Platform Versions</span>
@@ -327,7 +331,9 @@ 
?>



  <li>

   <h2><span class="en">More</span></h2>

    <span class="heading">

      <span class="en">More</span>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>resources/faq/commontasks.html">

            <span class="en">Common Tasks </span>

docs/html/sdk/sdk_toc.cs

+15 −12
Original line number Diff line number Diff line 
<?cs if:!sdk.redirect ?>

<ul>

  <li>

    <h2>

    <span class="heading">

      <span class="en">Android SDK Starter Package</span>

      <span style="display:none" class="de">Aktuelle SDK-Version</span>

      <span style="display:none" class="es">Versión actual del SDK</span>
@@ -10,7 +10,7 @@ 
      <span style="display:none" class="ja">現在リリースされている SDK</span>

      <span style="display:none" class="zh-CN">当前的 SDK 版本</span>

      <span style="display:none" class="zh-TW">目前 SDK 發行版本</span>

    </h2>

    </span>

    <ul><?cs

  if:android.whichdoc == "online" ?>

      <li><a href="<?cs var:toroot ?>sdk/index.html">
@@ -37,7 +37,8 @@ 
    </ul>

  </li><?cs

  if:sdk.preview ?>

  <li><h2>Android 3.0 Preview SDK</h2>

  <li>

    <span class="heading">Android 3.0 Preview SDK</span>

    <ul>

      <li><a href="<?cs var:toroot ?>sdk/preview/start.html">Getting Started</a> <span

class="new">new!</span></li>
@@ -46,13 +47,14 @@ class="new">new!</span></li> 
  /if ?>

  <?cs

  if:sdk.preview ?>

  <li><h2>Android x.x Preview</h2>

  <li>

    <span class="heading">Android x.x Preview</span>

    <ul>

    </ul>

  </li><?cs

  /if ?>

  <li>

    <h2>

    <span class="heading">

      <span class="en">Downloadable SDK Components</span>

      <span style="display:none" class="de"></span>

      <span style="display:none" class="es"></span>
@@ -61,7 +63,7 @@ class="new">new!</span></li> 
      <span style="display:none" class="ja"></span>

      <span style="display:none" class="zh-CN"></span>

      <span style="display:none" class="zh-TW"></span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>sdk/adding-components.html">

      <span class="en">Adding SDK Components</span>
@@ -158,7 +160,7 @@ class="new">new!</span></li> 
    </ul>

  </li>

  <li>

      <h2>

    <span class="heading">

      <span class="en">ADT Plugin for Eclipse</span>

      <span style="display:none" class="de"></span>

      <span style="display:none" class="es"></span>
@@ -167,7 +169,7 @@ class="new">new!</span></li> 
      <span style="display:none" class="ja"></span>

      <span style="display:none" class="zh-CN"></span>

      <span style="display:none" class="zh-TW"></span>

      </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 16.0.1

      <span style="display:none" class="de"></span>
@@ -182,7 +184,8 @@ class="new">new!</span> 
    </ul>

  </li>

  <li>

    <h2><span class="en">Native Development Tools</span>

    <span class="heading">

      <span class="en">Native Development Tools</span>

      <span style="display:none" class="de"></span>

      <span style="display:none" class="es"></span>

      <span style="display:none" class="fr"></span>
@@ -190,7 +193,7 @@ class="new">new!</span> 
      <span style="display:none" class="ja"></span>

      <span style="display:none" class="zh-CN"></span>

      <span style="display:none" class="zh-TW"></span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r7</a>

        <span class="new">new!</span>
@@ -200,7 +203,7 @@ class="new">new!</span> 
  </li>



  <li>

    <h2>

    <span class="heading">

      <span class="en">More Information</span>

      <span style="display:none" class="de"></span>

      <span style="display:none" class="es"></span>
@@ -209,7 +212,7 @@ class="new">new!</span> 
      <span style="display:none" class="ja"></span>

      <span style="display:none" class="zh-CN"></span>

      <span style="display:none" class="zh-TW"></span>

    </h2>

    </span>

    <ul>

      <li><a href="<?cs var:toroot ?>sdk/oem-usb.html">

        <span class="en">OEM USB Drivers</span>