am 37ac88f9: Merge "Update description of account_type" into ics-mr1

* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
  Update description of account_type
This commit is contained in:
Michael Chan
2011-11-23 12:14:16 -08:00
committed by Android Git Automerger

View File

@@ -280,11 +280,9 @@ Calendars.ACCOUNT_NAME}, you must also include
{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE} {@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
in the selection. That is because a given account is in the selection. That is because a given account is
only considered unique given both its <code>ACCOUNT_NAME</code> and its only considered unique given both its <code>ACCOUNT_NAME</code> and its
<code>ACCOUNT_TYPE</code>. The <code>ACCOUNT_TYPE</code> refers to the way that <code>ACCOUNT_TYPE</code>. The <code>ACCOUNT_TYPE</code> is the string corresponding to the
the account is being synced. It is often but not always the domain. For account authenticator that was used when the account was registered with the
example, an account could be synced through a corporate pop3 sync adapter, in which {@link android.accounts.AccountManager}. There is also a special type of account called {@link
case the <code>ACCOUNT_TYPE</code> would not be a domain. There is also a
special type of account called {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} for calendars not android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} for calendars not
associated with a device account. {@link associated with a device account. {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} accounts do not get android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} accounts do not get