chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java - Issue 1952853005: Surface sync error icon in account settings UI if sync error

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

Issue 1952853005: Surface sync error icon in account settings UI if sync error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 7 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

« no previous file with comments | « chrome/android/java/res/layout/sync_error_widget.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncPreference.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

index bf09b62fb8ce086fe0bf0154cd9c461a07c3322b..7e0bc7678e6dcbd87831b8b87d2c2eeceab58509 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

@@ -23,6 +23,8 @@ import org.chromium.chrome.browser.signin.AccountSigninActivity;

import org.chromium.chrome.browser.signin.SigninAccessPoint;

import org.chromium.chrome.browser.signin.SigninManager;

import org.chromium.chrome.browser.signin.SigninManager.SignInAllowedObserver;

+import org.chromium.chrome.browser.sync.GoogleServiceAuthError;

+import org.chromium.chrome.browser.sync.ProfileSyncService;

import org.chromium.sync.AndroidSyncSettings;

import org.chromium.sync.signin.ChromeSigninController;

@@ -93,6 +95,11 @@ public class SignInPreference extends Preference implements SignInAllowedObserve

}

title = TextUtils.isEmpty(cachedName) ? account.name : cachedName;

}

+ if (ProfileSyncService.get().getAuthError() != GoogleServiceAuthError.State.NONE) {

+ setWidgetLayoutResource(R.layout.sync_error_widget);

+ } else {

+ setWidgetLayoutResource(0);

+ }

}

setTitle(title);