Surface sync error icon in account settings UI if sync error

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
index c6758f2c76a25393e4f95e239ba0fcf3e7a20149..62deb41a6c885e3b68ab02f5e6d64c4eb929258d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
@@ -22,7 +22,6 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.UserManager;
@@ -34,7 +33,6 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Pair;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
@@ -252,35 +250,29 @@ public class AccountManagementFragment extends PreferenceFragment
     }
 
     private void configureSyncSettings() {
-        SyncPreference pref = (SyncPreference) findPreference(PREF_SYNC_SETTINGS);
-        // Sets preference icon and tints it to blue.
-        Drawable icon = ApiCompatibilityUtils.getDrawable(
-                getResources(), R.drawable.permission_background_sync);
-        icon.setColorFilter(
-                ApiCompatibilityUtils.getColor(getResources(), R.color.light_active_color),
-                PorterDuff.Mode.SRC_IN);
-        pref.setIcon(icon);
         final Preferences preferences = (Preferences) getActivity();
         final Account account = ChromeSigninController.get(getActivity()).getSignedInUser();
+        findPreference(PREF_SYNC_SETTINGS)
+                .setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        if (!isVisible() || !isResumed()) return false;
+
+                        if (ProfileSyncService.get() == null) return true;
+
+                        if (AndroidSyncSettings.isMasterSyncEnabled(preferences)) {
+                            Bundle args = new Bundle();
+                            args.putString(
+                                    SyncCustomizationFragment.ARGUMENT_ACCOUNT, account.name);
+                            preferences.startFragment(
+                                    SyncCustomizationFragment.class.getName(), args);
+                        } else {
+                            openSyncSettingsPage(preferences);
+                        }
 
-        pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                if (!isVisible() || !isResumed()) return false;
-
-                if (ProfileSyncService.get() == null) return true;
-
-                if (AndroidSyncSettings.isMasterSyncEnabled(preferences)) {
-                    Bundle args = new Bundle();
-                    args.putString(SyncCustomizationFragment.ARGUMENT_ACCOUNT, account.name);
-                    preferences.startFragment(SyncCustomizationFragment.class.getName(), args);
-                } else {
-                    openSyncSettingsPage(preferences);
-                }
-
-                return true;
-            }
-        });
+                        return true;
+                    }
+                });
     }
 
     private void configureGoogleActivityControls() {
@@ -497,7 +489,7 @@ public class AccountManagementFragment extends PreferenceFragment
     @Override
     public void syncStateChanged() {
         SyncPreference pref = (SyncPreference) findPreference(PREF_SYNC_SETTINGS);
-        pref.updateSyncSummary();
+        pref.updateSyncSummaryAndIcon();
 
         // TODO(crbug/557784): Show notification for sync error
     }