[Android] Add sign-out icon on AccountManagementFragment screen

Add a sign-out icon on the sign-out row in AccountManagementFragment

Screenshot: https://crbug.com/1131891#c2

Bug: 1131891
Change-Id: I3820aab37d54d7e9dd0e525dc0141072b884ef07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435193
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811695}

chrome/android/chrome_java_resources.gni

@@ -709,6 +709,7 @@ chrome_java_resources = [
   "java/res/drawable/ic_signal_cellular_2_bar.xml",
   "java/res/drawable/ic_signal_cellular_3_bar.xml",
   "java/res/drawable/ic_signal_cellular_4_bar.xml",
+  "java/res/drawable/ic_signout_40dp.xml",
   "java/res/drawable/ic_site_timer.xml",
   "java/res/drawable/ic_swap_vert_round.xml",
   "java/res/drawable/ic_sync_badge_error_20dp.xml",

chrome/android/java/res/drawable/ic_signout_40dp.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40"
+    tools:targetApi="21">
+
+  <path
+      android:pathData="M24.166 15.833l-1.175 1.175 2.15 2.159h-8.474v1.666h8.474l-2.15 2.15 1.175 1.184L28.334 20l-4.166-4.167zm-10.833-1.666H20V12.5h-6.667c-0.917 0-1.667 0.75-1.667 1.667v11.666c0 0.917 0.75 1.667 1.667 1.667H20v-1.667h-6.667V14.167z"
+      android:fillColor="@color/default_icon_color_secondary"
+      android:fillType="evenOdd"/>
+</vector>

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

@@ -197,6 +197,10 @@ public class AccountManagementFragment extends PreferenceFragmentCompat
             getPreferenceScreen().removePreference(signOutPreference);
             getPreferenceScreen().removePreference(findPreference(PREF_SIGN_OUT_DIVIDER));
         } else {
+            if (ChromeFeatureList.isEnabled(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)) {
+                signOutPreference.setLayoutResource(R.layout.account_management_account_row);
+                signOutPreference.setIcon(R.drawable.ic_signout_40dp);
+            }
             signOutPreference.setTitle(getSignOutPreferenceText());
             signOutPreference.setEnabled(getSignOutAllowedPreferenceValue());
             signOutPreference.setOnPreferenceClickListener(preference -> {