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

Commit d792e87d authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am a9e5a31f: am f4ba7833: am 0140854a: am 85dea528: Doc change: updated... 

am a9e5a31f: am f4ba7833: am 0140854a: am 85dea528: Doc change: updated images, landings, and ndk updates.

* commit 'a9e5a31f':
  Doc change: updated images, landings, and ndk updates.
parents 7d380144 a9e5a31f

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -1038,7 +1038,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ndk

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)

docs/html-ndk/ndk/guides/guides_toc.cs

+18 −3
Original line number Diff line number Diff line
@@ -6,10 +6,25 @@ 
       localized titles are added in the language order specified below.

?>





<ul id="nav">

  <li><a href="/ndk/guides/index.html"><span class="en">Getting Started</span></a></li>

  <li><a href="/ndk/guides/pg_html/md_1__concepts__concepts.html">Concepts</a></li>



  <li class="nav-section">

    <div class="nav-section-header"><a href="/ndk/guides/index.html">

            <span class="en">Getting Started</span></a>

    </div>

    <ul>

      <li><a href="/ndk/guides/md_1__concepts__concepts.html">

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

          </a></li>

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

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

          </a></li>

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

          <span class="en">System Permissions</span>

        </a>

      </li>

    </ul>

  </li>

</ul>

docs/html-ndk/ndk/index.jd

+63 −10
Original line number Diff line number Diff line 
page.title=Android NDK

page.tags="ndk, native, c, c++", 

meta.tags="ndk, native, c++"

fullpage=true

page.viewport_width=970

excludeFromSuggestions=true

page.metaDescription=The official Android NDK developer web site.

page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />



section.landing=true

header.hide=1

footer.hide=1

@jd:body



<section class="dac-expand dac-hero dac-dark dac-invert" style="background-repeat:no-repeat;">

  <div class="wrap">

    <div class="cols dac-hero-content" style="margin-top:32px">

      <div class="col-7of16 cdol-push-1of16">

        <h1 class="dac-hero-title">Android NDK</h1>

        <p class="dac-hero-description">

        The Android NDK is a toolset that lets you implement parts of your app using native code languages such as C and C++. For certain types of apps, this can help you reuse existing code libraries written in those languages.

        </p>



        <a class="dac-hero-cta" href="/ndk/guides/index.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Get Started

        </a><br>

      </div>

      <div class="col-8of16 col-push-1of16" style="margin-top:48px">



        <span style="color:#00e5ff;font-family:'Roboto Mono', monospace;font-weight:400">public class <span

        style="color:#eee">MyActivity</span> extends Activity {<br>

              <span style="color:#ccc">&nbsp;&nbsp;/**<br>

                &nbsp;&nbsp;* Native method implemented in C/C++<br>

                &nbsp;&nbsp;*/</span><br>

                &nbsp;&nbsp;public <span style="color:#1DE9B6;font-weight:700">native</span> void <span style="color:#eee">computerFoo()</span>;<br>

              }</span>

      </div>

    </div>

  </div>

</section>



<div class="wrap dac-offset-parent">

  <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">

    <i class="dac-sprite dac-arrow-down-gray"></i>

  </a>

</div>

<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">

  <h2 class="norule">Latest</h2>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="type:blog+tag:featured+tag:preview"

       data-cardSizes="6x6"

       data-maxResults="3"></div>

</div></section>



<section class="dac-section dac-light"><div class="wrap">

  <h1 class="dac-section-title">Something else</h1>

  <div class="dac-section-subtitle">

    Placeholder

  </div>



<h1>SUPER FANCY NDK LANDING PAGE<h1>

  <ul class="dac-section-links">

    <li class="dac-section-link"><a href="">

      <span class="dac-sprite dac-auto-chevron"></span>

      Overview and Usage

    </a></li>

    <li class="dac-section-link"><a href="/google/play/filters.html">

      <span class="dac-sprite dac-auto-chevron"></span>

      User Guide

    </a></li>



<p>Welcome to the placeholder text for the NDK. Here, you'll find all of the details you need to

combine the power of native code with Android flexibility and compatibility. The documents here

help you get started, introduce some key concepts that you should know when using the NDK, and then

provide a variety of other information that you'll find helpful while developing your app.</p>
 
  </ul>

</div></section>

docs/html/develop/index.jd

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ tabbedList=1 
excludeFromSuggestions=true

@jd:body



    <section class="dac-expand dac-hero dac-blue">

<section class="dac-expand dac-hero dac-section-light">

  <div class="wrap">

    <div class="cols dac-hero-content">

      <div class="col-1of2 col-push-1of2 dac-hero-figure">
@@ -25,7 +25,7 @@ excludeFromSuggestions=true 
          <span class="dac-sprite dac-auto-chevron"></span>

          Set up Android Studio

        </a><br>

        <a class="dac-hero-cta" href="{@docRoot}training/basics/firstapp/index.html">

        <a class="dac-hero-cta" href="{@docRoot}training/basics/training/index.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Build your first app

        </a><br>
@@ -117,12 +117,13 @@ excludeFromSuggestions=true 
  </ul>

</div></section>



<section class="dac-section dac-light"><div class="wrap">

<section class="dac-section dac-light" id="courses"><div class="wrap">

  <h1 class="dac-section-title">Online Courses</h1>

  <div class="dac-section-subtitle">Free online courses from Android

    experts that bring you step-by-step to building your own apps.</div>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:develop/landing/courses"

       data-sortOrder="random"

       data-cardSizes="6x6"

       data-maxResults="3"></div>

       data-maxResults="6"></div>

</div></section>

docs/html/google/index.jd

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ footer.hide=1 
  </div>

</section>



<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">

  <h2 class="norule">Latest</h2>

<section class="dac-section dac-gray dac-small dac-invert" id="videos"><div class="wrap">

  <h2 class="norule">Videos</h2>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:google/landing/videos"

       data-cardSizes="6x6"