PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell Brenner
2012-10-02 17:17:59 -07:00
committed by Android (Google) Code Review
parent 6258a0e22e 84d04c2053
commit d13e339685
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accounts/AddAccountSettings.java
View File

@@ -55,7 +55,7 @@ import java.io.IOException;
*/ */
public class AddAccountSettings extends Activity { public class AddAccountSettings extends Activity {
/** /**
* *
*/ */
private static final String KEY_ADD_CALLED = "AddAccountCalled"; private static final String KEY_ADD_CALLED = "AddAccountCalled";
@@ -71,6 +71,9 @@ public class AddAccountSettings extends Activity {
/* package */ static final String EXTRA_SELECTED_ACCOUNT = "selected_account"; /* 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 CHOOSE_ACCOUNT_REQUEST = 1;
private static final int DLG_MULTIUSER_WARNING = 1; private static final int DLG_MULTIUSER_WARNING = 1;
@@ -193,6 +196,7 @@ public class AddAccountSettings extends Activity {
Bundle addAccountOptions = new Bundle(); Bundle addAccountOptions = new Bundle();
mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0); mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0);
addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent); addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));
AccountManager.get(this).addAccount( AccountManager.get(this).addAccount(
accountType, accountType,
null, /* authTokenType */ null, /* authTokenType */