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

Commit a5f00687 authored by Trevor Johns's avatar Trevor Johns
Browse files

Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev 

Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	tools/droiddoc/templates-sdk/assets/css/default.css
	tools/droiddoc/templates-sdk/sdkpage.cs

Issue: 28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e
parents 7b67e0dd ebcf3977

tools/droiddoc/templates-ds/class.cs

+0 −2
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.synchronized ?>

            <?cs var:method.final ?>

            <?cs var:method.static ?>

            <?cs call:type_link(method.generic) ?>
@@ -535,7 +534,6 @@ From <?cs var:cl.kind ?> 
        <?cs var:method.static ?> 

        <?cs var:method.final ?> 

        <?cs var:method.abstract ?> 

        <?cs var:method.synchronized ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-ndk/class.cs

+0 −2
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.synchronized ?>

            <?cs var:method.final ?>

            <?cs var:method.static ?>

            <?cs call:type_link(method.generic) ?>
@@ -558,7 +557,6 @@ From <?cs var:cl.kind ?> 
        <?cs var:method.static ?> 

        <?cs var:method.final ?> 

        <?cs var:method.abstract ?> 

        <?cs var:method.synchronized ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-ndk/sdkpage.cs

+12 −21
Original line number Diff line number Diff line
@@ -80,13 +80,13 @@ 
      <th>Platform</th>

      <th>Package</th>

      <th style="white-space:nowrap">Size (Bytes)</th>

      <th>MD5 Checksum</th>

      <th>SHA1 Checksum</th>

  </tr>

  <tr>

    <td>Windows 32-bit</td>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>

    </td>

    <td><?cs var:ndk.win32_bytes ?></td>

    <td><?cs var:ndk.win32_checksum ?></td>
@@ -94,7 +94,7 @@ 
 <!-- <tr>

   <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.win32.legacy_download ?>"><?cs var:ndk.win32.legacy_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.win32.legacy_download ?>"><?cs var:ndk.win32.legacy_download ?></a>

    </td>

    <td><?cs var:ndk.win32.legacy_bytes ?></td>

    <td><?cs var:ndk.win32.legacy_checksum ?></td>
@@ -103,7 +103,7 @@ 
    <td>Windows 64-bit</td>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>

    </td>

    <td><?cs var:ndk.win64_bytes ?></td>

    <td><?cs var:ndk.win64_checksum ?></td>
@@ -111,7 +111,7 @@ 
 <!--  <tr>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>

    </td>

    <td><?cs var:ndk.win64.legacy_bytes ?></td>

    <td><?cs var:ndk.win64.legacy_checksum ?></td>
@@ -120,7 +120,7 @@ 
    <td>Mac OS X 32-bit</td>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>

    </td>

    <td><?cs var:ndk.mac32_bytes ?></td>

    <td><?cs var:ndk.mac32_checksum ?></td>
@@ -128,7 +128,7 @@ 
 <!--  <tr>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>

    </td>

    <td><?cs var:ndk.mac32.legacy_bytes ?></td>

    <td><?cs var:ndk.mac32.legacy_checksum ?></td>
@@ -136,7 +136,7 @@ 
    <td>Mac OS X 64-bit</td>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>

    </td>

    <td><?cs var:ndk.mac64_bytes ?></td>

    <td><?cs var:ndk.mac64_checksum ?></td>
@@ -144,24 +144,15 @@ 
 <!--  <tr>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>

    </td>

    <td><?cs var:ndk.mac64.legacy_bytes ?></td>

    <td><?cs var:ndk.mac64.legacy_checksum ?></td>

  </tr> -->

  <tr>

    <td>Linux 32-bit (x86)</td>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32_download ?>"><?cs var:ndk.linux32_download ?></a>

    </td>

    <td><?cs var:ndk.linux32_bytes ?></td>

    <td><?cs var:ndk.linux32_checksum ?></td>

  </tr>

 <!--  <tr>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>

    </td>

    <td><?cs var:ndk.linux32.legacy_bytes ?></td>

    <td><?cs var:ndk.linux32.legacy_checksum ?></td>
@@ -170,7 +161,7 @@ 
    <td>Linux 64-bit (x86)</td>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>

    </td>

    <td><?cs var:ndk.linux64_bytes ?></td>

    <td><?cs var:ndk.linux64_checksum ?></td>
@@ -178,7 +169,7 @@ 
  <!--  <tr>

    <td>

  <a onClick="return onDownload(this)"

     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>

     href="http://dl.google.com/android/repository/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>

    </td>

    <td><?cs var:ndk.linux64.legacy_bytes ?></td>

    <td><?cs var:ndk.linux64.legacy_checksum ?></td>

tools/droiddoc/templates-sac/class.cs

+0 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.synchronized ?>

            <?cs var:method.final ?>

            <?cs var:method.static ?>

            <?cs call:type_link(method.generic) ?>
@@ -539,7 +538,6 @@ From <?cs var:cl.kind ?> 
        <?cs var:method.static ?> 

        <?cs var:method.final ?> 

        <?cs var:method.abstract ?> 

        <?cs var:method.synchronized ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-sdk-dev/assets/css/default.css

+6658 −4191

File changed.

Preview size limit exceeded, changes collapsed.