Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 5d59130..5ce98ff 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -1,5 +1,5 @@
# WARNING: THIS FILE IS NOT USED IN PRODUCTION
-# CHANGES MADE HERE **DO NOT EFFECT** developer.android.com
+# CHANGES MADE HERE **DO NOT AFFECT** developer.android.com
# Instead, update the following file in the current docs release branch:
# <docs-release-branch>/vendor/google/docs/app-engine-server/v3/redirects.yaml
diff --git a/docs/html/distribute/users/appindexing.jd b/docs/html/distribute/users/appindexing.jd
deleted file mode 100644
index 04114e3..0000000
--- a/docs/html/distribute/users/appindexing.jd
+++ /dev/null
@@ -1,47 +0,0 @@
-page.title=Drive installs from Google Search
-page.metaDescription=Surface the content of your apps in Google Search and link it to app installs.
-meta.tags="getusers", "search", "appindexing"
-page.tags="app indexing", "search", "get users"
-page.image=images/cards/google-search_2x.png
-@jd:body
-
-<p>Google Search now helps users discover your app, with App Indexing. When users
-search with Google on their Android device the results will include details of
-relevant, indexed apps. The search results will include an install button that
-takes users to your app in the Google Play store. And when your app is
-installed, the user will be taken straight to the right content within it.</p>
-
-<div class="figure-left">
-<img src="{@docRoot}images/distribute/appindexing.gif">
-</div>
-
-<p>This free service expands your opportunities to turn the investment you’ve made
-in creating an outstanding app or game into installs. </p>
-
-<p>Start now by adding deep linking support to your app, verifying your app’s
-official website, and defining deep links. To learn how, check out these <a
-href="https://developers.google.com/app-indexing/webmasters/details">instructions</a>. </p>
-
-<p>Once your app is index, links to its content will join the 30 billion app index
-links already available to Google Search.</p>
-
-<h2 id=tips>Tips</h2>
-
-<ul>
- <li> App Indexing will also be used as a ranking signal for all users on Android,
-regardless of whether they have your app installed or not.
- <li> App Indexing also helps drive use of your app — when your app is installed on a
-user’s device, search results will include deep links to your app that bring
-the user straight to the relevant app content.
- <li> Use the App Indexing API to help users discover relevant content in your app
-before they complete a query with auto-completions.
-</ul>
-
-<h2 id=related_resources>Related resources</h2>
-
-<div class="resource-widget resource-flow-layout col-13"
- data-query="collection:distribute/users/appindexing"
- data-sortOrder="-timestamp"
- data-cardSizes="9x3"
- data-maxResults="6"></div>
-
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index a20fde0..94577ed 100755
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -226,10 +226,10 @@
<table>
<tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>
- <tr><td>Android 6.0</td>
+ <tr><td><a href="{@docRoot}about/versions/marshmallow/android-6.0.html">Android 6.0</a></td>
<td><a href="{@docRoot}sdk/api_diff/23/changes.html" title="Diff Report">23</a></td>
<td>{@link android.os.Build.VERSION_CODES#M}</td>
- <td><a href="{@docRoot}preview/api-overview.html">API Changes</a></td></tr>
+ <td><a href="{@docRoot}about/versions/marshmallow/index.html">Platform Highlights</a></td></tr>
<tr><td><a href="{@docRoot}about/versions/android-5.1.html">Android 5.1</a></td>
<td><a href="{@docRoot}sdk/api_diff/22/changes.html" title="Diff Report">22</a></td>
diff --git a/docs/html/images/distribute/appindexing.gif b/docs/html/images/distribute/appindexing.gif
deleted file mode 100644
index 6015d14..0000000
--- a/docs/html/images/distribute/appindexing.gif
+++ /dev/null
Binary files differ
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index ce8f5fb..63e93541 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -370,7 +370,6 @@
"resources": [
"distribute/users/your-listing.html",
"distribute/users/promote-with-ads.html",
- "distribute/users/appindexing.html",
"distribute/googleplay/index.html#opportunities",
"distribute/analyze/improve-roi.html",
"distribute/users/expand-to-new-markets.html",
@@ -1032,7 +1031,6 @@
"resources": [
"distribute/engage/intents.html",
"distribute/engage/deep-linking.html",
- "distribute/users/appindexing.html",
"training/app-indexing/index.html"
]
},
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
index f43ddd6..54b77b0 100644
--- a/docs/html/jd_extras_en.js
+++ b/docs/html/jd_extras_en.js
@@ -3527,7 +3527,6 @@
"resources": [
"distribute/users/your-listing.html",
"distribute/users/promote-with-ads.html",
- "distribute/users/appindexing.html",
"distribute/googleplay/index.html#opportunities",
"distribute/analyze/improve-roi.html",
"distribute/users/expand-to-new-markets.html",
@@ -4136,7 +4135,6 @@
"resources": [
"distribute/engage/intents.html",
"distribute/engage/deep-linking.html",
- "distribute/users/appindexing.html",
"training/app-indexing/index.html"
]
},
diff --git a/docs/html/ndk/downloads/index.jd b/docs/html/ndk/downloads/index.jd
index 116bbbb..b2e15c8 100644
--- a/docs/html/ndk/downloads/index.jd
+++ b/docs/html/ndk/downloads/index.jd
@@ -319,50 +319,36 @@
<h2 id="rel">Release Notes</h2>
- <p>Android NDK, Revision 11b</a> <em>(March 2016)</em></p>
- <dl>
- <dt>NDK</dt>
- <dd>
- <ul>
- <li>Important announcements
- <ul>
- <li>We’ve moved our bug tracker to <a href="https://github.com/android-ndk/ndk/issues">
- GitHub.</a></li>
- </ul>
- </li>
+<p>
+ Android NDK, Revision 11c <em>(March 2016)</em>
+</p>
- <li>Changes
+<dl>
+ <dt>
+ NDK
+ </dt>
+
+ <dd>
+ <ul>
+ <li>Changes
<ul>
- <li>{@code ndk-gdb.py} is fixed. It had
- <a href="https://github.com/android-ndk/ndk/issues/3">regressed entirely</a>
- in r11.</li>
- <li>{@code ndk-gdb} for Mac <a href="https://github.com/android-ndk/ndk/issues/2">
- is fixed</a>.</li>
- <li>Added more top-level shortcuts for command line tools:
- <ul>
- <li>{@code ndk-depends}.</li>
- <li>{@code ndk-gdb}.</li>
- <li>{@code ndk-stack}.</li>
- <li>{@code ndk-which}. This command had been entirely absent from previous
- releases.</li>
- </ul>
- </li>
- <li>Fixed standalone toolchains for libc++, which had been missing
- {@code __cxxabi_config.h}.</li>
- <li>Fixed help documentation for {@code --toolchain} in
- {@code make-standalone-toolchain.sh}.</li>
- </li>
- </ul>
- </dd>
- <dl>
- <dt>Clang</dt>
- <dd>
- <ul>
- <li>Errata</li>
- <ul>
- <li>Contrary to what we reported in the r11 Release Notes, {@code __thread}
- does not work. This is because the version of Clang we ship is missing a bug fix for
- emulated TLS support.</li>
- </ul>
- </ul>
- </dd>
+ <li>Applied additional fixes to the {@code ndk-gdb.py} script.
+ </li>
+ <li>Added an optional package name argument to the {@code ndk-gdb}
+ command {@code --attach} option.
+ (<a href="https://github.com/android-ndk/ndk/issues/13">Issue 13</a>)
+ </li>
+ <li>Fixed invalid toolchain paths for 32-bit Windows platform.
+ (<a href="https://github.com/android-ndk/ndk/issues/45">Issue 45</a>)
+ </li>
+ <li>Fixed the relative path for the {@code ndk-which} command.
+ (<a href="https://github.com/android-ndk/ndk/issues/29">Issue 29</a>)
+ </li>
+ <li>Fixed use of cygpath for the libgcc compiler.
+ (Android <a href="http://b.android.com/195486">Issue 195486</a>)
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </dd>
+</dl>
\ No newline at end of file
diff --git a/docs/html/ndk/downloads/revision_history.jd b/docs/html/ndk/downloads/revision_history.jd
index 5a7b7fc..0abd0e0 100644
--- a/docs/html/ndk/downloads/revision_history.jd
+++ b/docs/html/ndk/downloads/revision_history.jd
@@ -4,11 +4,73 @@
<p>This page provides information on previous releases of the NDK, enumerating the changes that
took place in each new version.</p>
+
+<div class="toggle-content closed">
+<a name="11b"></a>
+ <p>
+ <a href="#" onclick="return toggleContent(this)"> <img
+ src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
+ >Android NDK, Revision 11b</a> <em>(March 2016)</em>
+ </p>
+ <div class="toggle-content-toggleme">
+
+ <dl>
+ <dt>NDK</dt>
+ <dd>
+ <ul>
+ <li>Important announcements
+ <ul>
+ <li>We’ve moved our bug tracker to <a href="https://github.com/android-ndk/ndk/issues">
+ GitHub.</a></li>
+ </ul>
+ </li>
+
+ <li>Changes
+ <ul>
+ <li>{@code ndk-gdb.py} is fixed. It had
+ <a href="https://github.com/android-ndk/ndk/issues/3">regressed entirely</a>
+ in r11.</li>
+ <li>{@code ndk-gdb} for Mac <a href="https://github.com/android-ndk/ndk/issues/2">
+ is fixed</a>.</li>
+ <li>Added more top-level shortcuts for command line tools:
+ <ul>
+ <li>{@code ndk-depends}.</li>
+ <li>{@code ndk-gdb}.</li>
+ <li>{@code ndk-stack}.</li>
+ <li>{@code ndk-which}. This command had been entirely absent from previous
+ releases.</li>
+ </ul>
+ </li>
+ <li>Fixed standalone toolchains for libc++, which had been missing
+ {@code __cxxabi_config.h}.</li>
+ <li>Fixed help documentation for {@code --toolchain} in
+ {@code make-standalone-toolchain.sh}.</li>
+ </li>
+ </ul>
+ </dd>
+
+ <dt>Clang</dt>
+ <dd>
+ <ul>
+ <li>Errata</li>
+ <ul>
+ <li>Contrary to what we reported in the r11 Release Notes, {@code __thread}
+ does not work. This is because the version of Clang we ship is missing a bug fix for
+ emulated TLS support.</li>
+ </ul>
+ </ul>
+ </dd>
+ </dl>
+
+
+ </div>
+</div>
+
<div class="toggle-content closed">
<a name="11"></a>
<p>
<a href="#" onclick="return toggleContent(this)"> <img
- src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
+ src="/assets/images/styles/disclosure_down.png" class="toggle-content-img" alt=""
>Android NDK, Revision 11</a> <em>(March 2016)</em>
</p>
<div class="toggle-content-toggleme">
@@ -53,7 +115,7 @@
</li>
</ul>
</dd>
- <dl>
+ </dl>
<dl>
<dt>GCC</dt>
@@ -83,7 +145,7 @@
</li>
</ul>
</dd>
- <dl>
+ </dl>
<dl>
<dt>NDK</dt>
<dd>
@@ -268,6 +330,7 @@
</div>
</div>
+
<div class="toggle-content closed">
<a name="10e"></a>
<p>
diff --git a/docs/html/sdk/sdk_vars.cs b/docs/html/sdk/sdk_vars.cs
index 972980d..eb61447 100644
--- a/docs/html/sdk/sdk_vars.cs
+++ b/docs/html/sdk/sdk_vars.cs
@@ -39,18 +39,18 @@
set:sdk.win_installer_checksum='f9b59d72413649d31e633207e31f456443e7ea0b' ?><?cs
-set:ndk.mac64_download='android-ndk-r11b-darwin-x86_64.zip' ?><?cs
-set:ndk.mac64_bytes='772411311' ?><?cs
-set:ndk.mac64_checksum='c64fb355fec4da57d329ab45bf0aa29a1aec58dc' ?><?cs
+set:ndk.mac64_download='android-ndk-r11c-darwin-x86_64.zip' ?><?cs
+set:ndk.mac64_bytes='772428792' ?><?cs
+set:ndk.mac64_checksum='4ce8e7ed8dfe08c5fe58aedf7f46be2a97564696' ?><?cs
-set:ndk.linux64_download='android-ndk-r11b-linux-x86_64.zip' ?><?cs
-set:ndk.linux64_bytes='794138413' ?><?cs
-set:ndk.linux64_checksum='cf0658956945c81d3d3fad5f9a24fa062d4c9d41' ?><?cs
+set:ndk.linux64_download='android-ndk-r11c-linux-x86_64.zip' ?><?cs
+set:ndk.linux64_bytes='794135138' ?><?cs
+set:ndk.linux64_checksum='de5ce9bddeee16fb6af2b9117e9566352aa7e279' ?><?cs
-set:ndk.win64_download='android-ndk-r11b-windows-x86_64.zip' ?><?cs
-set:ndk.win64_bytes='771396549' ?><?cs
-set:ndk.win64_checksum='480eca1b29cfe73a5b35374730e6a82ca65c2aa6' ?><?cs
-set:ndk.win32_download='android-ndk-r11b-windows-x86.zip' ?><?cs
-set:ndk.win32_bytes='728894948' ?><?cs
-set:ndk.win32_checksum='b42da395440cc1c5dc4eeeb383679331addeb3ea'
+set:ndk.win64_download='android-ndk-r11c-windows-x86_64.zip' ?><?cs
+set:ndk.win64_bytes='771407642' ?><?cs
+set:ndk.win64_checksum='3d89deb97b3191c7e5555f1313ad35059479f071' ?><?cs
+set:ndk.win32_download='android-ndk-r11c-windows-x86.zip' ?><?cs
+set:ndk.win32_bytes='728899082' ?><?cs
+set:ndk.win32_checksum='ff939bde6cd374eecbd2c3b2ad218697f9a5038c'
?>
diff --git a/docs/html/training/sync-adapters/creating-sync-adapter.jd b/docs/html/training/sync-adapters/creating-sync-adapter.jd
index a790b87..0819c16 100644
--- a/docs/html/training/sync-adapters/creating-sync-adapter.jd
+++ b/docs/html/training/sync-adapters/creating-sync-adapter.jd
@@ -382,7 +382,7 @@
...
// Constants
// The authority for the sync adapter's content provider
- public static final String AUTHORITY = "com.example.android.datasync.provider"
+ public static final String AUTHORITY = "com.example.android.datasync.provider";
// An account type, in the form of a domain name
public static final String ACCOUNT_TYPE = "example.com";
// The account name
