Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5307)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

Issue 1698043006: Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
index ad7b3bdd6b76287eb979c66a4afab58ed743e0d7..26b3e5b410a139672bb3de2738c119ba0bb39249 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.invalidation.InvalidationController;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
import org.chromium.chrome.browser.preferences.SyncedAccountPreference;
import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.sync.SyncAccountSwitcher;
import org.chromium.sync.AndroidSyncSettings;
import org.chromium.sync.ModelType;
import org.chromium.sync.PassphraseType;
@@ -114,12 +115,13 @@ public class SyncCustomizationFragment extends PreferenceFragment
private Preference mSyncEncryption;
private Preference mManageSyncData;
private CheckBoxPreference[] mAllTypes;
+ private SyncedAccountPreference mSyncedAccountPreference;
private ProfileSyncService mProfileSyncService;
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
+ public View onCreateView(
+ LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
mProfileSyncService = ProfileSyncService.get();
assert mProfileSyncService != null;
mIsBackendInitialized = mProfileSyncService.isBackendInitialized();
@@ -176,6 +178,11 @@ public class SyncCustomizationFragment extends PreferenceFragment
}
});
+ mSyncedAccountPreference =
+ (SyncedAccountPreference) findPreference(PREFERENCE_SYNC_ACCOUNT_LIST);
+ mSyncedAccountPreference.setOnPreferenceChangeListener(new SyncAccountSwitcher(
+ getActivity(), getFragmentManager(), mSyncedAccountPreference));
+
return view;
}
@@ -288,9 +295,7 @@ public class SyncCustomizationFragment extends PreferenceFragment
}
private void updateSyncAccountsListState() {
- SyncedAccountPreference accountList =
- (SyncedAccountPreference) findPreference(PREFERENCE_SYNC_ACCOUNT_LIST);
- accountList.setEnabled(mSyncSwitchPreference.isChecked());
+ mSyncedAccountPreference.setEnabled(mSyncSwitchPreference.isChecked());
}
/**

Powered by Google App Engine
This is Rietveld 408576698