commit d13e3396852b4a98c46f2fc02d7a81dcdc1ab7f5
author Russell Brenner <russellbrenner@google.com> Tue Oct 02 17:17:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 02 17:18:00 2012 -0700
tree 0636d1313b32390f68ef7aa7ef8bb04b8cdb1bbe
parent 6258a0e22ed82f8fcc80e50ffda058ebcaf177e1
parent 84d04c20531c94a52d20098ee675ad55df9acf8f

Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev

src/com/android/settings/accounts/AddAccountSettings.java

diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index c5f2a9b..dffb1ee 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -55,7 +55,7 @@
  */
 public class AddAccountSettings extends Activity {
     /**
-     * 
+     *
      */
     private static final String KEY_ADD_CALLED = "AddAccountCalled";
 
@@ -71,6 +71,9 @@
 
     /* package */ static final String EXTRA_SELECTED_ACCOUNT = "selected_account";
 
+    // show additional info regarding the use of a device with multiple users
+    static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";
+
     private static final int CHOOSE_ACCOUNT_REQUEST = 1;
 
     private static final int DLG_MULTIUSER_WARNING = 1;
@@ -193,6 +196,7 @@
         Bundle addAccountOptions = new Bundle();
         mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0);
         addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
+        addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));
         AccountManager.get(this).addAccount(
                 accountType,
                 null, /* authTokenType */