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

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

am 6a273f0d: Merge "docs: de-new a bunch of docs" into ics-mr1 

* commit '6a273f0d':
  docs: de-new a bunch of docs
parents f4fde103 6a273f0d

docs/html/guide/guide_toc.cs

+6 −8
Original line number Diff line number Diff line
@@ -259,13 +259,13 @@ 
    <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">

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

          </a> <span class="new-child">new!</span></div>

          </a></div>

        <ul>

          <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html">

              <span class="en">Canvas and Drawables</span></a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/graphics/hardware-accel.html">

              <span class="en">Hardware Acceleration</span></a>

            <span class="new">new!</span></li>

            </li>

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

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

            </a></li>
@@ -287,7 +287,6 @@ 
      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/renderscript/index.html">

          <span class="en">Renderscript</span></a>

          <span class="new">updated</span>

        </div>

        <ul>

          <li><a href="<?cs var:toroot ?>guide/topics/renderscript/graphics.html">
@@ -318,7 +317,6 @@ 
                </li>

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

                  <span class="en">Camera</span></a>

                  <span class="new">new!</span>

                </li>

            <li><a href="<?cs var:toroot ?>guide/topics/media/audio-capture.html">

                  <span class="en">Audio Capture</span></a>
@@ -332,7 +330,7 @@ 
      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/sensors/index.html">

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

              </a> <span class="new">new!</span></div>

              </a></div>

        <ul>

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

              <span class="en">Sensors Overview</span>
@@ -373,7 +371,7 @@ 
          </li>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot?>guide/topics/nfc/index.html">

          <span class="en">Near Field Communication</span></a> <span class="new">updated</span>

          <span class="en">Near Field Communication</span></a>

        </div>

        <ul>

          <li><a href="<?cs var:toroot ?>guide/topics/nfc/nfc.html">NFC Basics</a></li>
@@ -381,7 +379,7 @@ 
        </ul>

      </li>

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

            <span class="en">Wi-Fi Direct</span></a> <span class="new">new!</span>

            <span class="en">Wi-Fi Direct</span></a>

          </li>

      <li class="toggle-list">

          <div><a href="<?cs var:toroot?>guide/topics/usb/index.html">
@@ -788,7 +786,7 @@ applications</span> 
      </li>

      <li><a href="<?cs var:toroot ?>guide/practices/tablets-and-handsets.html">

            <span class="en">Supporting Tablets and Handsets</span>

          </a> <span class="new">new!</span></li>

          </a></li>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/index.html">

               <span class="en">UI Guidelines</span>

docs/html/sdk/sdk_toc.cs

+6 −12
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ 
  <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>

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

    </ul>

  </li><?cs

  /if ?>
@@ -79,10 +78,9 @@ class="new">new!</span></li> 
    <ul>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>sdk/android-4.0-highlights.html">

        <span class="en">Android 4.0.x Platform</span></a> <span class="new">new!</span></div>

        <span class="en">Android 4.0.x Platform</span></a></div>

        <ul>

          <li><a href="<?cs var:toroot ?>sdk/android-4.0.3.html">Android 4.0.3 Platform</a>

            <span class="new">new!</span></li>

          <li><a href="<?cs var:toroot ?>sdk/android-4.0.3.html">Android 4.0.3 Platform</a></li>

          <li><a href="<?cs var:toroot ?>sdk/android-4.0.html">Android 4.0 Platform</a> </li>

        </ul>

      </li>
@@ -153,11 +151,9 @@ class="new">new!</span></li> 
      </li>

    </ul>

    <ul>

      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r17</a> <span

class="new">new!</span></li>

      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r17</a></li>

      <li><a href="<?cs var:toroot ?>sdk/win-usb.html">Google USB Driver, r4</a></li>

      <li><a href="<?cs var:toroot ?>sdk/compatibility-library.html">Support Package, r7</a>

      <span class="new">new!</span></li>

      <li><a href="<?cs var:toroot ?>sdk/compatibility-library.html">Support Package, r7</a></li>

    </ul>

  </li>

  <li>
@@ -179,8 +175,7 @@ class="new">new!</span></li> 
      <span style="display:none" class="it"></span>

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

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

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

class="new">new!</span>

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

      </li>

    </ul>

  </li>
@@ -197,7 +192,6 @@ class="new">new!</span> 
    </span>

    <ul>

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

        <span class="new">new!</span>

        </li>

      <li><a href="<?cs var:toroot ?>sdk/ndk/overview.html">What is the NDK?</a></li>

    </ul>