Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html-ndk/ndk/guides/android_mk.jd
index f0d1b4f..47fefc3 100644
--- a/docs/html-ndk/ndk/guides/android_mk.jd
+++ b/docs/html-ndk/ndk/guides/android_mk.jd
@@ -114,7 +114,7 @@
<p>There are more complex examples in the samples directories, with commented
{@code Android.mk} files that you can look at. In addition,
-<a href="{@docRoot}ndk/guides/sample_na.html">Sample: native-activity</a> provides
+<a href="{@docRoot}ndk/samples/sample_na.html">Sample: native-activity</a> provides
a detailed explanation of that sample's {@code Android.mk} file. Finally, <a href="#var">
Variables and Macros</a> provides further information on the variables from this section.
@@ -872,7 +872,4 @@
<p>In this example, the build system looks for the module tagged {@code <name>} in the list of
directories referenced that your {@code NDK_MODULE_PATH} environment variable references, and
-includes its {@code Android.mk} file automatically for you.</p>
-
-<p>For more information, see <a href="import.html">Android Module Paths (Sharing Code)</a>.
-</p>
+includes its {@code Android.mk} file automatically for you.</p>
\ No newline at end of file
diff --git a/docs/html-ndk/ndk/guides/prebuilts.jd b/docs/html-ndk/ndk/guides/prebuilts.jd
index f13e70e..52eb437 100644
--- a/docs/html-ndk/ndk/guides/prebuilts.jd
+++ b/docs/html-ndk/ndk/guides/prebuilts.jd
@@ -39,7 +39,7 @@
library appropriate to your target ABI. For more information on ensuring library support for
ABIs, see <a href="#sa">Selecting ABIs for Prebuilt Libraries.</a></p></li>
<li>Include {@code PREBUILT_SHARED_LIBRARY} or {@code PREBUILT_STATIC_LIBRARY}, depending on
- whether you are using a shared ({@code .so}) or static {@code .a}) library.</li>
+ whether you are using a shared ({@code .so}) or static ({@code .a}) library.</li>
</ol>
<p>Here is a trivial example that assumes the prebuilt library {@code libfoo.so} resides in
diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index 5fd6bb8..b8a6033 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -165,11 +165,11 @@
<p>To see an app implementation of this feature, refer to the
<a href="https://github.com/googlesamples/android-ConfirmCredentials" class="external-link">
- Confirm Device Credentials sample</a>.</p>
+ Confirm Credentials sample</a>.</p>
<h2 id="direct-share">Direct Share</h2>
-<img src="{@docRoot}preview/images/direct-share-screen_2x.png"
+<img src="{@docRoot}preview/images/direct-share-screen.png"
srcset="{@docRoot}preview/images/direct-share-screen.png 1x, preview/images/direct-share-screen_2x.png 2x"
style="float:right; margin:0 0 20px 30px" width="312" height="335" />
diff --git a/docs/html/preview/testing/performance.jd b/docs/html/preview/testing/performance.jd
index 4ac5a90..003b619 100644
--- a/docs/html/preview/testing/performance.jd
+++ b/docs/html/preview/testing/performance.jd
@@ -554,10 +554,10 @@
</h4>
<p>
- Tool suites like <a href=
- "https://developer.android.com/tools/testing-support-library/index.html">UIAutomator</a>,
- and <a href="https://code.google.com/p/android-test-kit/">Espresso</a> are built to help
- automate the action of a user moving through your application. These are simple
+ Tool suites, like <a href=
+ "{@docRoot}training/testing/ui-testing/uiautomator-testing.html">UI Automator</a> and
+ <a href="{@docRoot}training/testing/ui-testing/espresso-testing.html">Espresso</a>, are
+ built to help automate the action of a user moving through your application. These are simple
frameworks which mimic user interaction with your device. To use these frameworks, you
effectively create unique scripts, which run through a set of user-actions, and play them
out on the device itself.
@@ -585,7 +585,7 @@
<p>
It’s worth noting that UI testing frameworks (like <a href=
- "https://developer.android.com/tools/testing-support-library/index.html">UIAutomator</a>)
+ "{@docRoot}training/testing/ui-testing/uiautomator-testing.html">UI Automator</a>)
run on the target device/emulator directly. While performance gathering information done
by <em>dumpsys gfxinfo</em> is driven by a host machine, sending commands over ADB. To
help bridge the automation of these separate entities, <a href=
@@ -595,7 +595,7 @@
</p>
<p>
- Building a set of scripts for proper Automation of UI Performance testing, at a minimum,
+ Building a set of scripts for proper automation of UI Performance testing, at a minimum,
should be able to utilize monkeyRunner to accomplish the following tasks:
</p>
@@ -603,7 +603,7 @@
<li>Load & Launch a desired APK to a target device, devices, or emulator.
</li>
- <li>Launch a UIAutomator UI test, and allow it to be executed
+ <li>Launch a UI Automator UI test, and allow it to be executed
</li>
<li>Collect performance information through <em>dumpsys gfxinfo</em><em>.</em>
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 535a87e..0baef14 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -1654,6 +1654,14 @@
</ul>
</li> <!-- end of Background Jobs -->
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/best-performance.html">
+ <span class="small">Best Practices for</span><br/>
+ Performance
+ </a>
+ </div>
+ <ul>
<li>
<a href="<?cs var:toroot ?>training/articles/memory.html"
description=
@@ -1661,7 +1669,6 @@
on a variety of mobile devices."
>Managing Your App's Memory</a>
</li>
-
<li>
<a href="<?cs var:toroot ?>training/articles/perf-tips.html"
description=
@@ -1669,7 +1676,6 @@
responsiveness and battery efficiency."
>Performance Tips</a>
</li>
-
<li class="nav-section">
<div class="nav-section-header">
<a href="<?cs var:toroot ?>training/improving-layouts/index.html"
@@ -1697,7 +1703,6 @@
</li>
</ul>
</li>
-
<li class="nav-section">
<div class="nav-section-header">
<a href="<?cs var:toroot ?>training/monitoring-device-state/index.html"
@@ -1707,7 +1712,8 @@
description=
"How to minimize the amount of power your app requires by adapting to current
power conditions and performing power-hungry tasks at proper intervals."
- >Optimizing Battery Life</a>
+ >Optimizing Battery Life
+ </a>
</div>
<ul>
<li><a href="<?cs var:toroot ?>training/monitoring-device-state/battery-monitoring.html"
@@ -1763,7 +1769,6 @@
</li>
</ul>
</li>
-
<li>
<a href="<?cs var:toroot ?>training/articles/perf-anr.html"
description=
@@ -1771,7 +1776,6 @@
display an "Application Not Responding" dialog."
>Keeping Your App Responsive</a>
</li>
-
<li>
<a href="<?cs var:toroot ?>training/articles/perf-jni.html"
description=
@@ -1787,8 +1791,6 @@
</ul>
</li> <!-- end of Performance -->
-
-
<li class="nav-section">
<div class="nav-section-header">
<a href="<?cs var:toroot ?>training/best-security.html">
diff --git a/docs/html/training/tv/index.jd b/docs/html/training/tv/index.jd
index d52e1e8..ff9f111 100644
--- a/docs/html/training/tv/index.jd
+++ b/docs/html/training/tv/index.jd
@@ -8,4 +8,5 @@
<p>These classes teach you how to build apps for TV devices.</p>
-<p class="note"><strong>Note:</strong> For details on how to publish your TV apps in Google Play, see <a href="{docRoot}distribute/googleplay/tv.html">Distributing to Android TV</a>.</p>
\ No newline at end of file
+<p class="note"><strong>Note:</strong> For details on how to publish your TV apps in Google Play,
+see <a href="{@docRoot}distribute/googleplay/tv.html">Distribute to Android TV</a>.</p>
\ No newline at end of file