diff --git a/docs/html/images/training/oauth_dance.png b/docs/html/images/training/oauth_dance.png new file mode 100644 index 0000000000000..c519e92427955 Binary files /dev/null and b/docs/html/images/training/oauth_dance.png differ diff --git a/docs/html/training/id-auth/authenticate.jd b/docs/html/training/id-auth/authenticate.jd index 31352e72301af..63897c9765c0c 100644 --- a/docs/html/training/id-auth/authenticate.jd +++ b/docs/html/training/id-auth/authenticate.jd @@ -1,9 +1,9 @@ -page.title=Authenticating to OAuth2 Services -parent.title=Identifying and Authenticating Users +page.title=Authenticating to OAuth2 Services +parent.title=Remembering and Authenticating Users parent.link=index.html trainingnavtop=true -previous.title=Identifying Your User +previous.title=Remembering Your User previous.link=identify.html next.title=Creating a Custom Account Type next.link=custom_auth.html @@ -72,11 +72,10 @@ API.

Request an Auth Token

-

Now you're ready to request an auth token. Auth tokens usually expire after -some period of time, so you'll have to renew them.

+

Now you're ready to request an auth token. This is a multi-step process.

- +Procedure for obtaining
+a valid auth token from the Android Account Manager

To get an auth token you first need to request the {@link android.Manifest.permission#ACCOUNT_MANAGER} @@ -84,13 +83,13 @@ to yourmanifest file. To actually do anything useful with the token, you'll also need to add the {@link android.Manifest.permission#INTERNET} permission.

- +
 <manifest ... >
     <uses-permission android:name="android.permission.ACCOUNT_MANAGER" />
     <uses-permission android:name="android.permission.INTERNET" />
     ...
 </manifest>
-
+

Once your app has these permissions set, you can call {@link diff --git a/docs/html/training/id-auth/custom_auth.jd b/docs/html/training/id-auth/custom_auth.jd index 4f59746f51c99..0900d9a964064 100644 --- a/docs/html/training/id-auth/custom_auth.jd +++ b/docs/html/training/id-auth/custom_auth.jd @@ -1,5 +1,5 @@ -page.title=Creating a Custom Account Type -parent.title=Identifying and Authenticating Users +page.title=Creating a Custom Account Type +parent.title=Remembering and Authenticating Users parent.link=index.html trainingnavtop=true @@ -28,8 +28,9 @@ SampleSyncAdapter app -

In the previous lessons, we've talked about using Google accounts to identify Google users and -access Google APIs. But what if you've got your own online service? It turns out +

So far we've talked about accessing Google APIs, which use accounts and users +defined by Google. If you have your own online service, though, it won't have +Google accounts or users, so what do you do? It turns out to be relatively straightforward to install new account types on a user's device. This lesson explains how to create a custom account type that works the same way as the built-in accounts do.

diff --git a/docs/html/training/id-auth/identify.jd b/docs/html/training/id-auth/identify.jd index f18a34fe603f0..a9486280b9c4d 100644 --- a/docs/html/training/id-auth/identify.jd +++ b/docs/html/training/id-auth/identify.jd @@ -1,5 +1,5 @@ -page.title=Identifying Your User -parent.title=Identifying and Authenticating Users +page.title=Remembering Your User +parent.title=Remembering and Authenticating Users parent.link=index.html trainingnavtop=true @@ -17,8 +17,8 @@ next.link=authenticate.html
  • Decide What Type of Account to Use
  • Request GET_ACCOUNT permission
  • Query AccountManager for a List of Accounts
  • -
  • Use the Account Object to Identify the User
  • -
  • Decide Whether Identification is Enough
  • +
  • Use the Account Object to Personalize Your App
  • +
  • Decide Whether an Account Name is Enough
  • @@ -31,8 +31,8 @@ a tablet as well as a phone. But how do you know who your user is? And how do you recognize them on a new device?

    For many applications, the answer is the {@link android.accounts.AccountManager} APIs. With the -user's permission, you can use Account Manager to uniquely identify a user -by the online identity that the user has stored on their device.

    +user's permission, you can use Account Manager to fetch the account names +that the user has stored on their device.

    Integration with the user's accounts allows you to do a variety of things such as: