diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/downloads/downloads_toc.cs | 21 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/downloads/index.jd | 4 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/guides_toc.cs | 22 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/index.jd | 4 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/md_1__concepts__concepts.html | 4 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/index.jd | 15 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/reference/index.jd | 4 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/reference/reference_toc.cs | 21 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/samples/index.jd | 4 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/samples/samples_toc.cs | 21 | ||||
| -rw-r--r-- | docs/html/tools/extras/oem-usb.jd | 26 | ||||
| -rw-r--r-- | docs/html/tools/help/adb.jd | 1 | ||||
| -rw-r--r-- | docs/html/tools/help/systrace.jd | 3 |
14 files changed, 134 insertions, 20 deletions
@@ -992,13 +992,13 @@ LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) -LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR) +LOCAL_DROIDDOC_HTML_DIR:=docs/html-ndk LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR) LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) # specify a second html input dir and an output path relative to OUT_DIR) LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl / -LOCAL_MODULE := ndk +LOCAL_MODULE := online-ndk LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ diff --git a/docs/html-ndk/ndk/downloads/downloads_toc.cs b/docs/html-ndk/ndk/downloads/downloads_toc.cs new file mode 100644 index 0000000..66d0007 --- /dev/null +++ b/docs/html-ndk/ndk/downloads/downloads_toc.cs @@ -0,0 +1,21 @@ +<?cs # Table of contents for Dev Guide. + + For each document available in translation, add an localized title to this TOC. + Do not add localized title for docs not available in translation. + Below are template spans for adding localized doc titles. Please ensure that + localized titles are added in the language order specified below. +?> + + +<ul id="nav"> + <li><a href="/ndk/downloads/index.html"><span class="en">NDK Download</span></a></li> +</ul> + + +<script type="text/javascript"> +<!-- + buildToggleLists(); + changeNavLang(getLangPref()); +//--> +</script> + diff --git a/docs/html-ndk/ndk/downloads/index.jd b/docs/html-ndk/ndk/downloads/index.jd new file mode 100644 index 0000000..ef00069 --- /dev/null +++ b/docs/html-ndk/ndk/downloads/index.jd @@ -0,0 +1,4 @@ +page.title=NDK Downloads +@jd:body + +<p>downloads
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html-ndk/ndk/guides/guides_toc.cs new file mode 100644 index 0000000..e6bc199 --- /dev/null +++ b/docs/html-ndk/ndk/guides/guides_toc.cs @@ -0,0 +1,22 @@ +<?cs # Table of contents for Dev Guide. + + For each document available in translation, add an localized title to this TOC. + Do not add localized title for docs not available in translation. + Below are template spans for adding localized doc titles. Please ensure that + 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> +</ul> + + +<script type="text/javascript"> +<!-- + buildToggleLists(); + changeNavLang(getLangPref()); +//--> +</script> + diff --git a/docs/html-ndk/ndk/guides/index.jd b/docs/html-ndk/ndk/guides/index.jd new file mode 100644 index 0000000..8c3ecab --- /dev/null +++ b/docs/html-ndk/ndk/guides/index.jd @@ -0,0 +1,4 @@ +page.title=Concepts +@jd:body + +<p>To use the NDK, you must download it and install it separately from the SDK. To do so, follow these directions.
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/md_1__concepts__concepts.html b/docs/html-ndk/ndk/guides/md_1__concepts__concepts.html new file mode 100644 index 0000000..2dcf6ae --- /dev/null +++ b/docs/html-ndk/ndk/guides/md_1__concepts__concepts.html @@ -0,0 +1,4 @@ +page.title=Concepts +@jd:body + +<p>This section provides a high-level explanation of how the NDK works. The Android NDK is a set of tools allowing you to embed C or C++ (“native code”) into your Android apps. The ability to use native code in Android apps can be particularly useful to developers who wish to do one or more of the following:
\ No newline at end of file diff --git a/docs/html-ndk/ndk/index.jd b/docs/html-ndk/ndk/index.jd new file mode 100644 index 0000000..f1c5ce6 --- /dev/null +++ b/docs/html-ndk/ndk/index.jd @@ -0,0 +1,15 @@ +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" /> + +@jd:body + + +<h1>SUPER FANCY NDK LANDING PAGE<h1> + +<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> diff --git a/docs/html-ndk/ndk/reference/index.jd b/docs/html-ndk/ndk/reference/index.jd new file mode 100644 index 0000000..a496f19 --- /dev/null +++ b/docs/html-ndk/ndk/reference/index.jd @@ -0,0 +1,4 @@ +page.title=Reference +@jd:body + +<p>NDK reference docs
\ No newline at end of file diff --git a/docs/html-ndk/ndk/reference/reference_toc.cs b/docs/html-ndk/ndk/reference/reference_toc.cs new file mode 100644 index 0000000..01364a6 --- /dev/null +++ b/docs/html-ndk/ndk/reference/reference_toc.cs @@ -0,0 +1,21 @@ +<?cs # Table of contents for Dev Guide. + + For each document available in translation, add an localized title to this TOC. + Do not add localized title for docs not available in translation. + Below are template spans for adding localized doc titles. Please ensure that + localized titles are added in the language order specified below. +?> + + +<ul id="nav"> + <li><a href="/ndk/reference/index.html"><span class="en">foo.h</span></a></li> +</ul> + + +<script type="text/javascript"> +<!-- + buildToggleLists(); + changeNavLang(getLangPref()); +//--> +</script> + diff --git a/docs/html-ndk/ndk/samples/index.jd b/docs/html-ndk/ndk/samples/index.jd new file mode 100644 index 0000000..b333aa7 --- /dev/null +++ b/docs/html-ndk/ndk/samples/index.jd @@ -0,0 +1,4 @@ +page.title=Samples +@jd:body + +<p>NDK samples
\ No newline at end of file diff --git a/docs/html-ndk/ndk/samples/samples_toc.cs b/docs/html-ndk/ndk/samples/samples_toc.cs new file mode 100644 index 0000000..9fb036e --- /dev/null +++ b/docs/html-ndk/ndk/samples/samples_toc.cs @@ -0,0 +1,21 @@ +<?cs # Table of contents for Dev Guide. + + For each document available in translation, add an localized title to this TOC. + Do not add localized title for docs not available in translation. + Below are template spans for adding localized doc titles. Please ensure that + localized titles are added in the language order specified below. +?> + + +<ul id="nav"> + <li><a href="/ndk/samples/index.html"><span class="en">Stuff</span></a></li> +</ul> + + +<script type="text/javascript"> +<!-- + buildToggleLists(); + changeNavLang(getLangPref()); +//--> +</script> + diff --git a/docs/html/tools/extras/oem-usb.jd b/docs/html/tools/extras/oem-usb.jd index b25b41e..6d449ee 100644 --- a/docs/html/tools/extras/oem-usb.jd +++ b/docs/html/tools/extras/oem-usb.jd @@ -32,12 +32,13 @@ not exhaustive for all available Android-powered devices.</p> To start developing with your device, read <a href="{@docRoot}tools/device.html">Using Hardware Devices</a>.</p> -<p class="note"><strong>Note:</strong> If your device is one of the Android Developer Phones -(ADP), a Nexus One, or a Nexus S, then you need -the <a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a>, instead of an OEM driver. The Galaxy -Nexus driver, however, is distributed by <a -href="http://www.samsung.com/us/support/downloads/verizon-wireless/SCH-I515MSAVZW">Samsung</a> -(listed as model SCH-I515).</p> +<p>The Google USB Driver is <strong>required for Windows only</strong> in order to perform +<a href="{@docRoot}tools/help/adb.html">adb</a> debugging with any of +the <strong>Google Nexus devices</strong>. The one exception is the +Galaxy Nexus: the driver for Galaxy Nexus is distributed by <a +href="http://www.samsung.com/us/support/owners/product/GT-I9250TSGGEN">Samsung</a> +(listed as model GT-I9250TSGGEN).</p> + <h2 id="InstallingDriver">Installing a USB Driver</h2> @@ -99,7 +100,7 @@ driver:</p> <li>Select <strong>Device Manager</strong> in the left pane of the Computer Management window.</li> <li>Locate and expand <em>Android Phone</em> in the right pane.</li> - <li>Right-click <em>Android Composite ADB Interface</em> and select <strong>Update + <li>Right-click on <em>Android Composite ADB Interface</em> and select <strong>Update Driver</strong>. This will launch the Hardware Update Wizard.</li> <li>Select <strong>Install from a list or specific location</strong> and click @@ -145,14 +146,14 @@ driver:</p> and select <strong>Manage</strong>.</li> <li>Select <strong>Device Manager</strong> in the left pane.</li> <li>Locate and expand <em>ADB Interface</em> in the right pane.</li> - <li>Right-click on <em>HTC Dream Composite ADB Interface</em>, and select <strong>Update + <li>Right-click on <em>Android Composite ADB Interface</em>, and select <strong>Update Driver Software</strong>.</li> <li>When Vista starts updating the driver, a prompt will ask how you want to search for the driver software. Select <strong>Browse my computer for driver software</strong>.</li> <li>Click <strong>Browse</strong> and locate the USB driver folder. (The Google USB Driver is located in {@code <sdk>\extras\google\usb_driver\}.) As long as you specified the -exact location of the +exact location of the installation package, you may leave <strong>Include subfolders</strong> checked or unchecked—it doesn't matter.</li> <li>Click <strong>Next</strong>. Vista might prompt you to confirm the privilege elevation @@ -164,13 +165,6 @@ exact location of the <h2 id="Drivers">OEM Drivers</h2> -<p class="note"><strong>Note:</strong> If your device is one of the Android Developer Phones -(purchased from the Google Play Developer Console), a Nexus One, or a Nexus S, then you need -the <a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a>, instead of an OEM driver. The Galaxy -Nexus driver, however, is distributed by <a -href="http://www.samsung.com/us/support/downloads/verizon-wireless/SCH-I515MSAVZW">Samsung</a> -(listed as model SCH-I515).</p> - <table><tr> <th>OEM</th> diff --git a/docs/html/tools/help/adb.jd b/docs/html/tools/help/adb.jd index e2dd196..41c6686 100644 --- a/docs/html/tools/help/adb.jd +++ b/docs/html/tools/help/adb.jd @@ -962,7 +962,6 @@ install [options] <PATH> </code></td> <td>Installs a package (specified by {@code <PATH>}) to the system. <p>Options: <ul> - <li>{@code -l}: Install the package with forward lock. <li>{@code -r}: Reinstall an exisiting app, keeping its data. <li>{@code -t}: Allow test APKs to be installed. <li>{@code -i <INSTALLER_PACKAGE_NAME>}: Specify the installer package name. diff --git a/docs/html/tools/help/systrace.jd b/docs/html/tools/help/systrace.jd index d6fc05e..4461da9 100644 --- a/docs/html/tools/help/systrace.jd +++ b/docs/html/tools/help/systrace.jd @@ -68,7 +68,8 @@ or the Android <a href="{@docRoot}tools/help/monitor.html">Device Monitor</a>. <ol> <li>In <a href="{@docRoot}sdk/installing/studio.html">Android Studio</a>, open an Android application project.</li> - <li>Open the Device Monitor by selecting <strong>Tools > Android > Monitor</strong>.</li> + <li>Open the Device Monitor by selecting <strong>Tools > Android > Android Device + Monitor</strong>.</li> <li>In the <strong>Devices</strong> tab, select the device on which to run a trace. If no devices are listed, make sure your device is connected via USB cable and that debugging is enabled on the device.</li> |