[Android] Change 'Add account' icon in the account management page

If MOBILE_IDENTITY_CONSISTENCY feature flag is enabled, this screen
will use the same icon as the one AccountPickerDialog is using.

Screenshot: https://crbug.com/1107423#c9
Bug: 1107423
Change-Id: I796f8df61e2eba707e83b43c00a45e84b02d5d91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2390906
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809735}

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java

@@ -13,7 +13,6 @@ import android.os.Bundle;
 import android.os.UserManager;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -309,11 +308,12 @@ public class AccountManagementFragment extends PreferenceFragmentCompat
     private ChromeBasePreference createAddAccountPreference() {
         ChromeBasePreference addAccountPreference = new ChromeBasePreference(getStyledContext());
         addAccountPreference.setLayoutResource(R.layout.account_management_account_row);
-        addAccountPreference.setIcon(
-                AppCompatResources.getDrawable(requireContext(), R.drawable.ic_add_circle_40dp));
+
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)) {
+            addAccountPreference.setIcon(R.drawable.ic_person_add_40dp);
             addAccountPreference.setTitle(R.string.signin_add_account_to_device);
         } else {
+            addAccountPreference.setIcon(R.drawable.ic_add_circle_40dp);
             addAccountPreference.setTitle(R.string.account_management_add_account_title);
         }
         addAccountPreference.setOnPreferenceClickListener(preference -> {

chrome/android/javatests/src/org/chromium/chrome/browser/sync/AccountManagementFragmentTest.java

@@ -14,13 +14,14 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
-import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
 import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
+import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
 
 @RunWith(ChromeJUnit4ClassRunner.class)
@@ -45,14 +46,24 @@ public class AccountManagementFragmentTest {
     public void setUp() {
         mActivityTestRule.startMainActivityOnBlankPage();
         mAccountManagerTestRule.addAndSignInTestAccount();
+        mSettingsActivityTestRule.startSettingsActivity();
     }
 
     @Test
     @MediumTest
     @Feature("RenderTest")
+    @Features.DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
     public void testAccountManagementFragmentViewLegacy() throws Exception {
-        SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
-        mRenderTestRule.render(settingsActivity.getMainFragment().getView(),
+        mRenderTestRule.render(mSettingsActivityTestRule.getFragment().getView(),
                 "account_management_fragment_view_legacy");
     }
+
+    @Test
+    @MediumTest
+    @Feature("RenderTest")
+    @Features.EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
+    public void testAccountManagementFragmentView() throws Exception {
+        mRenderTestRule.render(mSettingsActivityTestRule.getFragment().getView(),
+                "account_management_fragment_view");
+    }
 }