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

Issue 1745563002: Revert of Created the dialog offering the user to merge their account data or keep it (Closed)

Created:
4 years, 10 months ago by aelias_OOO_until_Jul13
Modified:
4 years, 10 months ago
CC:
chromium-reviews, tim+watch_chromium.org, tfarina, maxbogue+watch_chromium.org, plaree+watch_chromium.org, zea+watch_chromium.org
Base URL:
maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Created the dialog offering the user to merge their account data or keep it (patchset #12 id:220001 of https://codereview.chromium.org/1698043006/ ) Reason for revert: Causes the downstream test failure http://crbug.com/590238 in "testConsumerSignin", blocking the Clank roll. junit.framework.AssertionFailedError: Could not locate the fragment with tag 'account_picker_dialog_tag' BUG=590238 Original issue's description: > (formerly: Created the dialog offering the user to merge their account data or keep it) > > This CL contains two changes to the Switching Sync Account flows. > - It adds the ability to switch sync accounts, presenting a dialog offering the user to merge their account data or keep it separate. > - It upgrades the account signin from preferences from using the ChooseAccountFragment to using the AccountSigninView (formerly the AccountFirstRunView). > > In addition it: > - Renames AccountFirstRunView to AccountSigninView (since it is not used only in the first run). > - Renames functions in the AccountSigninView from using SignIn to Signin. > > The following user actions were modified: > - Signin_AddAccountToDevice > - Signin_ImportDataPrompt_Cancel > - Signin_ImportDataPrompt_DontImport > - Signin_ImportDataPrompt_ImportData > - Signin_Signin_FromSettings > - Signin_Undo_Signin > > BUG=557786 > > Committed: https://crrev.com/bd705aeab0594a1790478e335edee728f32fb026 > Cr-Commit-Position: refs/heads/master@{#377769} TBR=maybelle@chromium.org,bauerb@chromium.org,yusufo@chromium.org,newt@chromium.org,gogerald@chromium.org,x-a-x@hotmail.co.th,ewald@chromium.org,skym@chromium.org,peconn@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=557786 Committed: https://crrev.com/69f627a982835d9d06bf0177ce497d0850dda6f4 Cr-Commit-Position: refs/heads/master@{#377978}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1234 lines, -1572 lines) Patch
M chrome/android/java/AndroidManifest.xml View 1 chunk +0 lines, -3 lines 0 comments Download
D chrome/android/java/res/layout/account_signin_view.xml View 1 chunk +0 lines, -153 lines 0 comments Download
D chrome/android/java/res/layout/confirm_import_sync_data.xml View 1 chunk +0 lines, -42 lines 0 comments Download
A chrome/android/java/res/layout/confirm_sync_account_change_account.xml View 1 chunk +21 lines, -0 lines 0 comments Download
A chrome/android/java/res/layout/fre_choose_account.xml View 1 chunk +153 lines, -0 lines 0 comments Download
M chrome/android/java/res/layout/fre_data_reduction_proxy.xml View 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/java/res/layout/fre_tosanduma.xml View 1 chunk +1 line, -1 line 0 comments Download
D chrome/android/java/res/layout/radio_button_with_description.xml View 1 chunk +0 lines, -32 lines 0 comments Download
M chrome/android/java/res/values/attrs.xml View 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/android/java/res/values/colors.xml View 1 chunk +1 line, -4 lines 0 comments Download
M chrome/android/java/res/values/dimens.xml View 1 chunk +4 lines, -8 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSigninActivity.java View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java View 3 chunks +6 lines, -7 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunView.java View 1 chunk +616 lines, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/firstrun/DataReductionProxyView.java View 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/firstrun/ImageCarousel.java View 3 chunks +3 lines, -3 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java View 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java View 5 chunks +5 lines, -12 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java View 1 chunk +3 lines, -1 line 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java View 3 chunks +94 lines, -17 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java View 3 chunks +3 lines, -11 lines 0 comments Download
D chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninActivity.java View 1 chunk +0 lines, -118 lines 0 comments Download
D chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java View 1 chunk +0 lines, -671 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmAccountChangeFragment.java View 1 chunk +114 lines, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java View 5 chunks +43 lines, -8 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java View 5 chunks +6 lines, -12 lines 0 comments Download
D chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java View 1 chunk +0 lines, -81 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ChooseAccountFragment.java View 1 chunk +63 lines, -0 lines 0 comments Download
D chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmImportSyncDataDialog.java View 1 chunk +0 lines, -208 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java View 3 chunks +2 lines, -9 lines 0 comments Download
D chrome/android/java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java View 1 chunk +0 lines, -107 lines 0 comments Download
M chrome/android/java/strings/android_chrome_strings.grd View 4 chunks +41 lines, -58 lines 0 comments Download
M chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java View 3 chunks +51 lines, -0 lines 0 comments Download

Messages

Total messages: 5 (1 generated)
aelias_OOO_until_Jul13
Created Revert of Created the dialog offering the user to merge their account data or ...
4 years, 10 months ago (2016-02-26 21:06:06 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1745563002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1745563002/1
4 years, 10 months ago (2016-02-26 21:08:16 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 10 months ago (2016-02-26 21:13:21 UTC) #3
commit-bot: I haz the power
4 years, 10 months ago (2016-02-26 21:14:18 UTC) #5
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/69f627a982835d9d06bf0177ce497d0850dda6f4
Cr-Commit-Position: refs/heads/master@{#377978}

Powered by Google App Engine
This is Rietveld 408576698