Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
diff --git a/docs/html/design/index.jd b/docs/html/design/index.jd
index b19422b..1e6b40c 100644
--- a/docs/html/design/index.jd
+++ b/docs/html/design/index.jd
@@ -2,37 +2,6 @@
header.hide=1
footer.hide=1
@jd:body
-<style>
-#butterbar-wrapper {
- position:absolute;
- top:0;
- left:0;
- width:100%;
-}
-#butterbar {
- width:940px;
- margin:0 auto;
-}
-#butterbar-message {
- background-color:#f80;
- float:right;
- font-size:12px;
- font-weight:bold;
- padding:0 10px;
- border-radius: 0 0 5px 5px;
-}
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
-</style>
-
- <div id="butterbar-wrapper" >
- <div id="butterbar" >
- <div id="butterbar-message">
-<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/17EFbvdm4FYkocc83EcrKhyhP5Y6tbns_eiBSeQ6ojxU/viewform">
- Take the Android Developer Survey</a>
- </div>
- </div>
-</div>
<style>
#landing-graphic-container {
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 70d3f6d..3ca7b80 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -4,37 +4,6 @@
carousel=1
tabbedList=1
@jd:body
-<style>
-#butterbar-wrapper {
- position:absolute;
- top:0;
- left:0;
- width:100%;
-}
-#butterbar {
- width:940px;
- margin:0 auto;
-}
-#butterbar-message {
- background-color:#f80;
- float:right;
- font-size:12px;
- font-weight:bold;
- padding:0 10px;
- border-radius: 0 0 5px 5px;
-}
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
-</style>
-
- <div id="butterbar-wrapper" >
- <div id="butterbar" >
- <div id="butterbar-message">
-<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/17EFbvdm4FYkocc83EcrKhyhP5Y6tbns_eiBSeQ6ojxU/viewform">
- Take the Android Developer Survey</a>
- </div>
- </div>
-</div>
<style>
#noplayer-message {
diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd
index a950971..54f9301 100644
--- a/docs/html/distribute/index.jd
+++ b/docs/html/distribute/index.jd
@@ -2,53 +2,21 @@
header.hide=1
@jd:body
-<style>
-#butterbar-wrapper {
- position:absolute;
- top:0;
- left:0;
- width:100%;
-}
-#butterbar {
- width:940px;
- margin:0 auto;
-}
-#butterbar-message {
- background-color:#f80;
- float:right;
- font-size:12px;
- font-weight:bold;
- padding:0 10px;
- border-radius: 0 0 5px 5px;
-}
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
-</style>
-
- <div id="butterbar-wrapper" >
- <div id="butterbar" >
- <div id="butterbar-message">
-<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/17EFbvdm4FYkocc83EcrKhyhP5Y6tbns_eiBSeQ6ojxU/viewform">
- Take the Android Developer Survey</a>
- </div>
- </div>
-</div>
- <div class="marquee">
-
- <div continer>
-
+<div class="marquee">
<div class="madin-img" style="position:absolute;margin-left:42px;margin-top:76px;">
- <img src="/images/home/google-play.png">
+ <img src="{@docRoot}images/home/google-play.png">
</div>
<div class="copy" style="position:relative;left:480px;width:360;">
<h1 style="margin-bottom:10px;">Your Apps on Google Play</h1>
- <p>The most visited store in the world for Android apps. Cloud-connected and always synced, it's never been easier for users to find and download your apps.</p>
-
- <p><a class="button" href="https://play.google.com/apps/publish/">Go to Developer Console »</a></p>
- </div> </div>
+ <p>The most visited store in the world for Android apps. Cloud-connected and always synced,
+ it's never been easierfor users to find and download your apps.</p>
+ <p><a class="button" href="https://play.google.com/apps/publish/"
+ >Go to Developer Console »</a></p>
+ </div>
</div>
+
<div class="distribute-features col-13" style="clear:both;margin-top:246px;">
<ul>
<li><h5>Growth Engine</h5>
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index b2051d1..8611534 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -23,7 +23,7 @@
</li>
<li><a href="<?cs var:toroot?>google/play-services/auth.html">
- <span class="en">Authentication</span></a>
+ <span class="en">Authorization</span></a>
</li>
<li><a href="<?cs var:toroot?>google/play-services/plus.html">
diff --git a/docs/html/google/play-services/auth.jd b/docs/html/google/play-services/auth.jd
index b1b19e9..3f46c3f 100644
--- a/docs/html/google/play-services/auth.jd
+++ b/docs/html/google/play-services/auth.jd
@@ -1,4 +1,4 @@
-page.title=Authentication
+page.title=Authorization
@jd:body
<div id="qv-wrapper">
@@ -6,28 +6,28 @@
<h2>In this document</h2>
<ol>
<li><a href="#choose">Choosing an Account</a></li>
- <li><a href="#obtain">Obtaining an Authorization Token</a></li>
+ <li><a href="#obtain">Obtaining an Access Token</a></li>
<li><a href="#handle">Handling Exceptions</a></li>
- <li><a href="#use">Using the Token</a></li>
+ <li><a href="#use">Using the Access Token</a></li>
</ol>
</div>
</div>
<p>
- Google Play services offers a standard authentication flow for all Google APIs and
- all components of Google Play services. In addition, you can leverage the authentication
- portion of the Google Play services SDK to authenticate to services that are not yet supported
- in the Google Play services platform by using the authentication token to manually make API
+ Google Play services offers a standard authorization flow for all Google APIs and
+ all components of Google Play services. In addition, you can leverage the authorization
+ portion of the Google Play services SDK to gain authorization to services that are not yet supported
+ in the Google Play services platform by using the access token to manually make API
requests or using a client library provided by the service provider.
</p>
-<p>For implementation details, see the sample in <code><android-sdk>/extras/google-play-services/samples/auth</code>, which shows you how
-to carry out these basic steps for obtaining an authentication token.</p>
+<p>For implementation details, see the sample in <code><android-sdk>/extras/google-play-services/samples/auth</code>,
+which shows you how to carry out these basic steps for obtaining an acesss token.</p>
<h2 id="choose">Choosing an Account</h2>
<p>
Google Play services leverage existing accounts on an Android-powered device
- to authenticate to the services that you want to use. To obtain an authorization token,
+ to gain authorization to the services that you want to use. To obtain an access token,
a valid Google account is required and it must exist on the device. You can ask your users which
account they want to use by enumerating the Google accounts on the device or using the
built-in
@@ -39,7 +39,7 @@
</p>
<p>
For example, here's how to gather all of the Google accounts on a device and return them
- in an array. When obtaining an authorization token, only the email address of the account is
+ in an array. When obtaining an access token, only the email address of the account is
needed, so that is what the array stores:
</p>
@@ -55,24 +55,24 @@
return names;
}
</pre>
-<h2 id="obtain">Obtaining an Authorization Token</h2>
+<h2 id="obtain">Obtaining an Access Token</h2>
<p>
- With an email address, you can now obtain an authorization token. There are two general
+ With an email address, you can now obtain an access token. There are two general
ways to get a token:</p>
<ul>
<li>Call one of the two overloaded <a
href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getToken(android.content.Context, java.lang.String, java.lang.String)"
>{@code GoogleAuthUtil.getToken()}</a> methods in a foreground activity where you can
- display a dialog to the user to interactively handle authentication errors.</li>
+ display a dialog to the user to interactively handle authorization errors.</li>
<li>Call one of the three <a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getTokenWithNotification(android.content.Context, java.lang.String, java.lang.String, android.os.Bundle)"
>{@code getTokenWithNotification()}</a>
- methods if you are authenticating in a background service or sync adapter so that a notification is displayed if an authentication
- error occurs.</a></li>
+ methods if you are trying to gain authorization in a background service or sync adapter so that a
+ notification is displayed if an error occurs.</a></li>
</ul>
<h3>Using getToken()</h3>
- The following code snippet obtains an authentication token with an email address, the scope that you want to use for the service, and a {@link android.content.Context}:
+ The following code snippet obtains an access token with an email address, the scope that you want to use for the service, and a {@link android.content.Context}:
<pre>
HelloActivity mActivity;
String mEmail;
@@ -90,13 +90,13 @@
<p>Call this method off of the main UI thread since it executes network transactions. An easy way to do this
is in an {@link android.os.AsyncTask}.
The sample in the Google Play services SDK shows you how to wrap this call in an AsyncTask.
- If authentication is successful, the token is returned. If not, the exceptions described in
+ If authorization is successful, the token is returned. If not, the exceptions described in
<a href="#handle">Handling Exceptions</a>
are thrown that you can catch and handle appropriately.
</p>
<h3>Using getTokenWithNotification()</h3>
- <p>If you are obtaining authentication tokens in a background service or sync adapter, there
+ <p>If you are obtaining access tokens in a background service or sync adapter, there
are three overloaded
<a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getTokenWithNotification(android.content.Context, java.lang.String, java.lang.String, android.os.Bundle)"
>{@code getTokenWithNotification()}</a> methods
@@ -104,11 +104,11 @@
<ul>
<li><a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getTokenWithNotification(android.content.Context, java.lang.String, java.lang.String, android.os.Bundle)"
>{@code getTokenWithNotification(Context context, String accountName, String scope, Bundle extras)}</a>:
- For background services. Displays a notification to the user when authentication errors occur.</li>
+ For background services. Displays a notification to the user when authorization errors occur.</li>
<li><a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getTokenWithNotification(android.content.Context, java.lang.String, java.lang.String, android.os.Bundle, android.content.Intent)"
>{@code getTokenWithNotification(Context context, String accountName, String scope, Bundle extras, Intent callback)}</a>:
This method is for use in background services. It displays a notification to the user
- when authentication errors occur. If a user clicks the notification and then authorizes the
+ when authorization errors occur. If a user clicks the notification and then authorizes the
app to access the account, the intent is broadcasted. When using this method:
<ul>
<li>Create a {@link android.content.BroadcastReceiver} that registers the intent and handles
@@ -123,7 +123,7 @@
<li><a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getTokenWithNotification(android.content.Context, java.lang.String, java.lang.String, android.os.Bundle, java.lang.String, android.os.Bundle)"
>{@code getTokenWithNotification(Context context, String accountName, String scope, Bundle extras, String authority, Bundle syncBundle)}</a>:
This method is for use in sync adapters. It displays a notification to the user when
-authentication errors occur. If a user clicks the notification and then authorizes the
+errors occur. If a user clicks the notification and then authorizes the
app to access the account, the sync adapter retries syncing with the information
contained in the <code>syncBundle</code> parameter.</li>
</ul>
@@ -135,7 +135,7 @@
<h2 id="handle">Handling Exceptions</h2>
<p>
- When requesting an authentication token with
+ When requesting an access token with
<a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getToken(android.content.Context, java.lang.String, java.lang.String)"
>{@code GoogleAuthUtil.getToken()}</a>,
the following exceptions can be thrown:
@@ -167,7 +167,7 @@
<a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthException.html">{@code
GoogleAuthException}</a>:
This exception is thrown when the authorization fails, such as when an invalid scope is
- specified or if the email address used to authenticate is actually not on the user's
+ specified or if the email address used for authorization is actually not on the user's
device.
</li>
<li>
@@ -189,7 +189,7 @@
-<h2 id="use">Using the Token</h2>
+<h2 id="use">Using the Access Token</h2>
<p>
Once you have successfully obtained a token, you can use it to access Google services.
Many Google services provide client libraries, so it is recommended that you use these when
@@ -224,7 +224,7 @@
<p>
Notice that you must manually invalidate the token if the response from the server
- signifies an authentication error (401). This could mean the authentication token
+ signifies an authorization error (401). This could mean the access token
being used is invalid for the service's scope or the token may have expired. If this is the
case, obtain a new token using <a
href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getToken(android.content.Context, java.lang.String, java.lang.String)"
diff --git a/docs/html/google/play-services/dist.jd b/docs/html/google/play-services/dist.jd
deleted file mode 100644
index e179bff..0000000
--- a/docs/html/google/play-services/dist.jd
+++ /dev/null
@@ -1,56 +0,0 @@
-page.title=Google Play Distribution and Licensing
-@jd:body
-
-
-<h2 id="distribution">
- Manage App Distribution and Licensing
-</h2>
-<p>
- Google Play allows you to manage your app distribution with features that let you control which users
- can download your app as well as deliver separate versions of your app based on certain
- characteristics like platform version.
-</p>
-<div class="vspace size-1">
-
-</div>
-<div class="layout-content-row">
- <div class="layout-content-col span-6">
- <h4>
- Device Filtering
- </h4>
- <p>
- Make sure your app gets to the right users by filtering on a wide range of characteristics
- such as platform versions and hardware features.
- </p><p><a href="{@docRoot}google/play/filters.html">Learn more »</a></p>
- </div>
-
- <div class="layout-content-col span-6">
- <h4>
- Multiple APK Support
- </h4>
- <p>
- Distribute different APKs based on a variety of properties such as platform version, screen
- size, and GLES texture compression support.
- </p><p><a href="{@docRoot}google/play/publishing/multiple-apks.html">Learn more »</a></p>
- </div>
-
-<div class="layout-content-row">
- <div class="layout-content-col span-6">
- <h4>
- APK Expansion files
- </h4>
- <p>
- Tap into Google's content delivery services by serving up to 4GB of assets for free. Provide
- users with high-fidelity graphics, media files, or other large assets that are required by
- your app.
- </p><a href="{@docRoot}google/play/expansion-files.html">Learn more »</a>
- </div>
-
- <div class="layout-content-col span-6">
- <h4>
- Application Licensing
- </h4>
- <p>Protect your revenue streams and integrate policies for usage into your app.
- </p><a href="{@docRoot}google/play/licensing/index.html">Learn more »</a>
- </div>
-</div>
\ No newline at end of file
diff --git a/docs/html/google/play-services/index.jd b/docs/html/google/play-services/index.jd
index fae1e1a..82167bc 100644
--- a/docs/html/google/play-services/index.jd
+++ b/docs/html/google/play-services/index.jd
@@ -37,10 +37,10 @@
</div>
<div class="layout-content-col span-4">
-<h4>Standard Authentication</h4>
-<p>All products in Google Play services share a common authentication API
+<h4>Standard Authorization</h4>
+<p>All products in Google Play services share a common authorization API
that leverages the existing Google accounts on the device. You and your
- users have a consistent and safe way to grant and receive OAuth2 authentication
+ users have a consistent and safe way to grant and receive OAuth2 access tokens
to Google services.</p>
</div>
@@ -66,7 +66,7 @@
<h4 id="client-lib">The Google Play services client library</h4>
<p>
The client library contains the interfaces to the individual Google
- services and allows you to obtain authorization from users to authenticate
+ services and allows you to obtain authorization from users to gain access
to these services with their credentials. It also contains APIs that allow
you to resolve any issues at runtime, such as a missing, disabled, or out-of-date
Google Play services APK. The client library has a light footprint if you use
@@ -90,7 +90,7 @@
The Google Play services APK contains the individual Google services and runs
as a background service in the Android OS. You interact with the background service
through the client library and the service carries out the actions on your behalf.
- An easy-to-use authentication flow is also
+ An easy-to-use authorization flow is also
provided to gain access to the each Google service, which provides consistency for both
you and your users.
</p>
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 0dc1757..e91b68c 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -4,38 +4,6 @@
page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers.
@jd:body
-<style>
-#butterbar-wrapper {
- position:absolute;
- top:0;
- left:0;
- width:100%;
-}
-#butterbar {
- width:940px;
- margin:0 auto;
-}
-#butterbar-message {
- background-color:#f80;
- float:right;
- font-size:12px;
- font-weight:bold;
- padding:0 10px;
- border-radius: 0 0 5px 5px;
-}
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
-</style>
-
- <div id="butterbar-wrapper" >
- <div id="butterbar" >
- <div id="butterbar-message">
-<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/17EFbvdm4FYkocc83EcrKhyhP5Y6tbns_eiBSeQ6ojxU/viewform">
- Take the Android Developer Survey</a>
- </div>
- </div>
-</div>
-
<div class="wrap">
<!-- Slideshow -->
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 77909b8..c4e0f84 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -845,13 +845,14 @@
</li>
</ul>
</li>
-<!-- Background Service -->
+
<li class="nav-section">
<div class="nav-section-header">
<a href="<?cs var:toroot ?>training/run-background-service/index.html"
description=
"How to improve UI performance and responsiveness by sending work to a
- Service running in the background">Running in a Background Service</a>
+ Service running in the background"
+ >Running in a Background Service</a>
</div>
<ul>
<li><a href="<?cs var:toroot ?>training/run-background-service/create-service.html">
@@ -868,6 +869,23 @@
</li>
</ul>
</li>
+
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>training/load-data-background/index.html"
+ description="How to use CursorLoader to query data without
+ affecting UI responsiveness."
+ >Loading Data in the Background</a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>training/load-data-background/setup-loader.html">
+ Running a Query with a CursorLoader</a>
+ </li>
+ <li><a href="<?cs var:toroot ?>training/load-data-background/handle-results.html">
+ Handling the Results</a>
+ </li>
+ </ul>
+ </li>
<li class="nav-section">
<div class="nav-section-header">