summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2011-09-19 13:59:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-19 13:59:21 -0700
commitd30d2aae108a132ac6ee04cdf29cbec50cc73320 (patch)
treecb333db3c284ca56be8b6b1168105b570d1c9d75 /core/java/android
parent735e85769f10966267afd490204de6e388307fe5 (diff)
parentd88324d8ab8b98bbc2c21551be3a8981ee431181 (diff)
downloadframeworks_base-d30d2aae108a132ac6ee04cdf29cbec50cc73320.zip
frameworks_base-d30d2aae108a132ac6ee04cdf29cbec50cc73320.tar.gz
frameworks_base-d30d2aae108a132ac6ee04cdf29cbec50cc73320.tar.bz2
am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
* commit 'd88324d8ab8b98bbc2c21551be3a8981ee431181': Fixed the javadoc for AccountManager.newChooseAccountIntent()
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/accounts/AccountManager.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index 3d3a373..150880c 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -1782,7 +1782,8 @@ public class AccountManager {
* <p>
* The most common case is to call this with one account type, e.g.:
* <p>
- * <pre> newChooseAccountsIntent(null, null, new String[]{"com.google"}, null);</pre>
+ * <pre> newChooseAccountsIntent(null, null, new String[]{"com.google"}, false, null,
+ * null, null, null);</pre>
* @param selectedAccount if specified, indicates that the {@link Account} is the currently
* selected one, according to the caller's definition of selected.
* @param allowableAccounts an optional {@link ArrayList} of accounts that are allowed to be
@@ -1792,13 +1793,14 @@ public class AccountManager {
* when adding an account.
* @param alwaysPromptForAccount if set the account chooser screen is always shown, otherwise
* it is only shown when there is more than one account from which to choose
- * @param descriptionOverrideText if set, this string is used as the description in the
+ * @param descriptionOverrideText if non-null this string is used as the description in the
* accounts chooser screen rather than the default
- * @param addAccountAuthTokenType This {@link Bundle} is passed as the {@link #addAccount}
- * authTokenType
- * @param addAccountRequiredFeatures This {@link Bundle} is passed as the {@link #addAccount}
- * requiredFeatures
+ * @param addAccountAuthTokenType this string is passed as the {@link #addAccount}
+ * authTokenType parameter
+ * @param addAccountRequiredFeatures this string array is passed as the {@link #addAccount}
+ * requiredFeatures parameter
* @param addAccountOptions This {@link Bundle} is passed as the {@link #addAccount} options
+ * parameter
* @return an {@link Intent} that can be used to launch the ChooseAccount activity flow.
*/
static public Intent newChooseAccountIntent(Account selectedAccount,