| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
|
| index 9a7f8ff9fe92613900b8c53c4bca72bec681b0fb..9251e9d1f317c6fbad5a60bfda69cf5b0b988ee9 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
|
| @@ -17,9 +17,10 @@ import org.chromium.sync.signin.ChromeSigninController;
|
|
|
| /**
|
| * A preference that displays the account currently being synced and allows the user to choose a new
|
| - * account to use for syncing
|
| + * account to use for syncing. The values used are the account names.
|
| */
|
| public class SyncedAccountPreference extends ListPreference {
|
| + private static final String TAG = "SyncedAccountPreference";
|
|
|
| /**
|
| * Constructor for inflating from XML
|
| @@ -30,6 +31,14 @@ public class SyncedAccountPreference extends ListPreference {
|
| updateAccountsList();
|
| }
|
|
|
| + /**
|
| + * Updates the list of accounts to those currently signed in and sets the display to the
|
| + * current sync account.
|
| + */
|
| + public void update() {
|
| + updateAccountsList();
|
| + }
|
| +
|
| private void updateAccountsList() {
|
| boolean syncEnabled = AndroidSyncSettings.isSyncEnabled(getContext());
|
| if (!syncEnabled) {
|
| @@ -57,13 +66,12 @@ public class SyncedAccountPreference extends ListPreference {
|
|
|
| setEntries(accountNames);
|
| setEntryValues(accountValues);
|
| - setDefaultValue(signedInSettingsKey);
|
| + setValue(signedInSettingsKey);
|
| setSummary(signedInAccountName);
|
| }
|
|
|
| @Override
|
| protected void onDialogClosed(boolean positiveResult) {
|
| super.onDialogClosed(positiveResult);
|
| - // TODO(crbug/557786): Add switching sync accounts
|
| }
|
| }
|
|
|