[Android] Change sign-out string in the account management screen

If sync hasn't been turned on, the string should be "Sign out".
Otherwise, the existing "Sign out and turn off sync" string should be
used.


Bug: 1107421
Change-Id: I2dc84c34aba4deea8707d5b49fd838b153da9040
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368360
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Alice Wang <aliceywang@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803051}

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

@@ -189,14 +189,14 @@ public class AccountManagementFragment extends PreferenceFragmentCompat
     }
 
     private void configureSignOutSwitch() {
-        Preference signOutSwitch = findPreference(PREF_SIGN_OUT);
+        Preference signOutPreference = findPreference(PREF_SIGN_OUT);
         if (mProfile.isChild()) {
-            getPreferenceScreen().removePreference(signOutSwitch);
+            getPreferenceScreen().removePreference(signOutPreference);
             getPreferenceScreen().removePreference(findPreference(PREF_SIGN_OUT_DIVIDER));
         } else {
-            signOutSwitch.setTitle(R.string.sign_out_and_turn_off_sync);
-            signOutSwitch.setEnabled(getSignOutAllowedPreferenceValue());
-            signOutSwitch.setOnPreferenceClickListener(preference -> {
+            signOutPreference.setTitle(getSignOutPreferenceText());
+            signOutPreference.setEnabled(getSignOutAllowedPreferenceValue());
+            signOutPreference.setOnPreferenceClickListener(preference -> {
                 if (!isVisible() || !isResumed()) return false;
 
                 if (mSignedInAccountName != null && getSignOutAllowedPreferenceValue()) {
@@ -264,6 +264,18 @@ public class AccountManagementFragment extends PreferenceFragmentCompat
         }
     }
 
+    private int getSignOutPreferenceText() {
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)) {
+            if (!IdentityServicesProvider.get()
+                            .getIdentityManager(Profile.getLastUsedRegularProfile())
+                            .hasPrimaryAccount()) {
+                // There is no syncing account.
+                return R.string.sign_out;
+            }
+        }
+        return R.string.sign_out_and_turn_off_sync;
+    }
+
     private void updateAccountsList() {
         PreferenceCategory accountsCategory =
                 (PreferenceCategory) findPreference(PREF_ACCOUNTS_CATEGORY);

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -297,6 +297,9 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SIGN_OUT_AND_TURN_OFF_SYNC" desc="The text for a preferences row that for signs out the user and turns off sync.">
         Sign out and turn off sync
       </message>
+      <message name="IDS_SIGN_OUT" desc="The text for a preference row that signs out the user.">
+        Sign out
+      </message>
       <message name="IDS_MANAGE_YOUR_GOOGLE_ACCOUNT" desc="Title for link to Google Account Page to manage account settings.">
         Manage your Google Account
       </message>

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SIGN_OUT.png.sha1

+31f1474eabef1c4c2514f460483b685c8a2ea94f
\ No newline at end of file