Merge "docs: NDK site - fix empty landing page section" into mnc-preview-docs
diff --git a/Android.mk b/Android.mk
index 184392a..acf509c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -747,6 +747,7 @@
-samplegroup RenderScript \
-samplegroup Security \
-samplegroup Sensors \
+ -samplegroup System \
-samplegroup Testing \
-samplegroup UI \
-samplegroup Views \
diff --git a/docs/html-ndk/ndk/reference/index.jd b/docs/html-ndk/ndk/reference/index.jd
index a89c152..94bcb7a 100644
--- a/docs/html-ndk/ndk/reference/index.jd
+++ b/docs/html-ndk/ndk/reference/index.jd
@@ -1,12 +1,17 @@
page.title=API Reference
@jd:body
-<p>The API reference for the NDK currently comprises documentation for the base set of
+<p>The API reference for the NDK includes documentation for the base set of
native headers that the NDK provides for Android. These headers, and their associated libraries,
-provide functionalities such as:</p>
+expose a variety of features otherwise only accessible via the Android framework.
+A few of these features are as follows:</p>
<ul>
<li>Using hardware sensors.</li>
<li>Accessing storage.</li>
<li>Handling user input.</li>
-</ul>
\ No newline at end of file
+ <li>Setting configuration information, such as screen orientation.</li>
+</ul>
+
+<p>The API reference provides detailed information on these and other functionalities provided
+in the NDK.</p>
diff --git a/docs/html-ndk/ndk/reference/reference_toc.cs b/docs/html-ndk/ndk/reference/reference_toc.cs
index 404a0a6..8ddb864 100644
--- a/docs/html-ndk/ndk/reference/reference_toc.cs
+++ b/docs/html-ndk/ndk/reference/reference_toc.cs
@@ -15,21 +15,21 @@
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___bitmap.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___bitmap.html"><span class="en">
Bitmap</span></a></div>
<ul>
<li><a href="/ndk/reference/bitmap_8h.html">bitmap.h</a></li>
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___configuration.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___configuration.html"><span class="en">
Configuration</span></a></div>
<ul>
<li><a href="/ndk/reference/configuration_8h.html">configuration.h</a></li>
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___input.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___input.html"><span class="en">
Input</span></a></div>
<ul>
<li><a href="/ndk/reference/input_8h.html">input.h</a></li>
@@ -37,14 +37,14 @@
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___looper.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___looper.html"><span class="en">
Looper</span></a></div>
<ul>
<li><a href="/ndk/reference/looper_8h.html">looper.h</a></li>
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___native_activity.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___native_activity.html"><span class="en">
Native Activity and Window</span></a></div>
<ul>
<li><a href="/ndk/reference/native__activity_8h.html">native_activity.h</a></li>
@@ -54,20 +54,20 @@
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___sensor.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___sensor.html"><span class="en">
Sensor</span></a></div>
<ul>
<li><a href="/ndk/reference/sensor_8h.html">sensor.h</a></li>
</ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="/ndk/reference/group___storage.html"><span class="en">
+ <div class="nav-section-header"><a href="/ndk/reference/group___storage.html"><span class="en">
Storage Manager</span></a></div>
- </li>
<ul>
<li><a href="/ndk/reference/storage__manager_8h.html">sensor_manager.h</a></li>
<li><a href="/ndk/reference/obb_8h.html">obb.h</a></li>
</ul>
+ </li>
</ul>
<script type="text/javascript">
diff --git a/docs/html-ndk/ndk/samples/downloads.jd b/docs/html-ndk/ndk/samples/downloads.jd
deleted file mode 100644
index 3e5e3b7..0000000
--- a/docs/html-ndk/ndk/samples/downloads.jd
+++ /dev/null
@@ -1,24 +0,0 @@
-page.title=Samples: Downloads
-@jd:body
-
-<style>
-
-.landing-button {
- min-width: 155px;
- text-align: center;
-}
-</style>
-
-<p>From this page, you can download samples that provide a look at the NDK in action. A few of the
-topics covered are:</p>
-
-<ul>
- <li>Managing your native app's activity lifecycle.</li>
- <li>Using native OpenGL on an Android device.</li>
- <li>Implementing native audio.</li>
- <li>Exporting modules.</li>
-</ul>
-
-<p class="landing-button landing-secondary"><a href="{@docRoot}ndk/samples/samples_download.zip">Download the NDK Samples</a>
-</p>
-
diff --git a/docs/html-ndk/ndk/samples/index.jd b/docs/html-ndk/ndk/samples/index.jd
index ce03f1c..6b2cd16 100644
--- a/docs/html-ndk/ndk/samples/index.jd
+++ b/docs/html-ndk/ndk/samples/index.jd
@@ -1,13 +1,26 @@
-page.title=Samples
+page.title=Samples: Overview
@jd:body
-<p>Welcome to the NDK samples area. Here, you can
-<a href="{@docRoot}ndk/samples/downloads.html">download</a> a variety of sample apps to help
-deepen your understanding of how to use the NDK. There are also detailed
-<a href="{@docRoot}ndk/samples/walkthroughs.html">walkthroughs</a> of several
-of the apps, providing additional insight into key topics.</p>
+<p>Welcome to the NDK samples area. Here, you can download a variety of sample
+apps to help deepen your understanding the NDK.
-<p>These samples are also contained in the NDK installation package. They reside in
+
+<p>From this page, you can download samples that provide a look at the NDK in action. A few of the
+topics covered are:</p>
+
+<ul>
+ <li>Managing your native app's activity lifecycle.</li>
+ <li>Using native OpenGL on an Android device.</li>
+ <li>Implementing native audio.</li>
+ <li>Exporting modules.</li>
+</ul>
+
+<p class="note"><strong>Note: </strong>These samples are also contained in the NDK installation
+package; if you have already downloaded the NDK, you have them. They reside in
{@code $NDK/samples/}, where {@code $NDK} is the NDK installation root.</p>
+ <div id="sdk-terms-form">
+ <p><a href="{@docRoot}shareables/ndk/ndk-samples.zip" class="button">
+ Download ndk-samples.zip</a></p>
+ </div>
diff --git a/docs/html-ndk/ndk/samples/sample_hellojni.jd b/docs/html-ndk/ndk/samples/sample_hellojni.jd
index 8d11989..fa61b28 100644
--- a/docs/html-ndk/ndk/samples/sample_hellojni.jd
+++ b/docs/html-ndk/ndk/samples/sample_hellojni.jd
@@ -18,7 +18,7 @@
<p>This sample guides you through HelloJNI, a minimal
application built with the NDK. This sample is in the {@code samples/hello-jni/} directory
-under the root directory of your NDK installation.</p>
+under the root directory of your NDK installation.</p>
<h2 id="an">Android.mk</h2>
diff --git a/docs/html-ndk/ndk/samples/sample_na.jd b/docs/html-ndk/ndk/samples/sample_na.jd
index a677de5..a706be5 100644
--- a/docs/html-ndk/ndk/samples/sample_na.jd
+++ b/docs/html-ndk/ndk/samples/sample_na.jd
@@ -23,7 +23,7 @@
The stub serves as a wrapper for the actual, native program, which is located in the {@code .so}
file.</p>
-<p>The app itself simply renders a color onto the entire screen, and
+<p>The app itself simply renders a color onto the entire screen, and
then changes the color partly in response to movement that it detects.</p>
<h2 id="am">AndroidManifest.xml</h2>
diff --git a/docs/html-ndk/ndk/samples/sample_teapot.jd b/docs/html-ndk/ndk/samples/sample_teapot.jd
index 6d19de6..97708a7 100644
--- a/docs/html-ndk/ndk/samples/sample_teapot.jd
+++ b/docs/html-ndk/ndk/samples/sample_teapot.jd
@@ -20,7 +20,7 @@
installation's root directory. This sample uses the OpenGL library to render the iconic
<a href="http://math.hws.edu/bridgeman/courses/324/s06/doc/opengl.html#basic">Utah
teapot</a>. In particular, it showcases the {@code ndk_helper} helper class,
-a collection of native helper functions required for implementing games and
+a collection of native helper functions required for implementing games and
similar applications as native applications. This class provides:</p>
<ul>
diff --git a/docs/html-ndk/ndk/samples/samples_download.zip b/docs/html-ndk/ndk/samples/samples_download.zip
deleted file mode 100644
index 35265be..0000000
--- a/docs/html-ndk/ndk/samples/samples_download.zip
+++ /dev/null
Binary files differ
diff --git a/docs/html-ndk/ndk/samples/samples_toc.cs b/docs/html-ndk/ndk/samples/samples_toc.cs
index e0dcf04..92266b1 100644
--- a/docs/html-ndk/ndk/samples/samples_toc.cs
+++ b/docs/html-ndk/ndk/samples/samples_toc.cs
@@ -7,22 +7,22 @@
?>
<ul id="nav">
+
<li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>ndk/samples/downloads.html">
- <span class="en">Downloads</span></a></div>
+ <div class="nav-section-header empty"><a href="<?cs var:toroot ?>ndk/samples/index.html">
+ <span class="en">Overview</span></a></div>
</li>
<li class="nav-section">
<div class="nav-section-header">
- <a href="<?cs var:toroot ?>ndk/samples/walkthroughs.html"><span class="en">
- Walkthroughs</span></a></div>
+ <a href="<?cs var:toroot ?>ndk/samples/walkthroughs.html">
+ <span class="en">Walkthroughs</span></a></div>
<ul>
- <li><a href="<?cs var:toroot ?>ndk/samples/sample_hellojni.html">hello-jni</a></li>
- <li><a href="<?cs var:toroot ?>ndk/samples/sample_na.html">sample-na</a></li>
- <li><a href="<?cs var:toroot ?>ndk/samples/sample_teapot.html">Teapot</a></li>
+ <li><a href="<?cs var:toroot ?>ndk/samples/sample_hellojni.html">hello-jni</a></li>
+ <li><a href="<?cs var:toroot ?>ndk/samples/sample_na.html">native-activity</a></li>
+ <li><a href="<?cs var:toroot ?>ndk/samples/sample_teapot.html">Teapot</a></li>
</ul>
</li>
-
</ul>
diff --git a/docs/html-ndk/ndk/samples/walkthroughs.jd b/docs/html-ndk/ndk/samples/walkthroughs.jd
index b214e66..88ceb56 100644
--- a/docs/html-ndk/ndk/samples/walkthroughs.jd
+++ b/docs/html-ndk/ndk/samples/walkthroughs.jd
@@ -4,7 +4,10 @@
<p>This section provides detailed walkthroughs of several key samples. The samples are as
follows:</p>
-<li><a href="{@docRoot}ndk/samples/sample_hellojni.html">hello-jni</a>: A very basic app that illustrates core workings of the NDK.</li>
-<li><a href="{@docRoot}ndk/samples/sample_na.html">native-activity</a>: An app that shows the fundamentals of constructing a purely native app. It places particular emphasis on the
+<li><a href="{@docRoot}ndk/samples/sample_hellojni.html">hello-jni</a>: A very basic app that
+illustrates core workings of the NDK.</li>
+<li><a href="{@docRoot}ndk/samples/sample_na.html">native-activity</a>: An app that shows the
+fundamentals of constructing a purely native app. It places particular emphasis on the
{@code android_native_app_glue library}.</li>
-<li><a href="<a href="{@docRoot}ndk/samples/sample_teapot.html">Teapot</a>: A simple OpenGL demo, showcasing the <code>ndk_helper</code> class.</li>
\ No newline at end of file
+<li><a href="<a href="{@docRoot}ndk/samples/sample_teapot.html">Teapot</a>: A simple OpenGL demo,
+showcasing the <code>ndk_helper</code> class.</li>
diff --git a/docs/html/samples/system.jd b/docs/html/samples/system.jd
new file mode 100644
index 0000000..618673d
--- /dev/null
+++ b/docs/html/samples/system.jd
@@ -0,0 +1,11 @@
+page.title=System
+@jd:body
+
+
+<div id="samples" class="system">
+</div>
+
+
+<script>
+ $(document).ready(showSamples);
+</script>