[UPM] Change the sync error message subtitle
The secondary title string is updated to align with the UPM error
message.
Bug: 1352415, 1364144
Change-Id: I3374a72508f27dff9b5fab50737305564fc4ce07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3891225
Reviewed-by: Friedrich Horschig <fhorschig@chromium.org>
Commit-Queue: Ivana Žužić <izuzic@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1047545}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
index d561483d..c8f8ee91 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
@@ -3,6 +3,8 @@
// found in the LICENSE file.
package org.chromium.chrome.browser.sync.settings;
+import static org.chromium.chrome.browser.flags.ChromeFeatureList.UNIFIED_PASSWORD_MANAGER_ERROR_MESSAGES;
+
import android.app.Activity;
import android.app.PendingIntent;
import android.content.Context;
@@ -29,6 +31,7 @@
import org.chromium.chrome.browser.LaunchIntentDispatcher;
import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider.CustomTabsUiType;
import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.sync.SyncService;
@@ -131,7 +134,9 @@
public static String getSyncErrorHint(Context context, @SyncError int error) {
switch (error) {
case SyncError.AUTH_ERROR:
- return context.getString(R.string.hint_sync_auth_error);
+ return ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ERROR_MESSAGES)
+ ? context.getString(R.string.hint_sync_auth_error_modern)
+ : context.getString(R.string.hint_sync_auth_error);
case SyncError.CLIENT_OUT_OF_DATE:
return context.getString(
R.string.hint_client_out_of_date, BuildInfo.getInstance().hostPackageLabel);
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 6d96e66..537d8032 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2109,6 +2109,9 @@
<message name="IDS_HINT_SYNC_AUTH_ERROR" desc="Hint message to resolve sync auth error.">
Sign in again to start sync
</message>
+ <message name="IDS_HINT_SYNC_AUTH_ERROR_MODERN" desc="Hint message to resolve sync auth error updated to align with the UPM error message.">
+ Sign back in to start sync
+ </message>
<message name="IDS_HINT_SYNC_RECOVERABILITY_DEGRADED_FOR_EVERYTHING" desc="Hint message to resolve sync degraded recoverability, for users that have not chosen to encrypt all sync data">
Make sure you can always access your sync data
</message>
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_HINT_SYNC_AUTH_ERROR_MODERN.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_HINT_SYNC_AUTH_ERROR_MODERN.png.sha1
new file mode 100644
index 0000000..c43c59ab
--- /dev/null
+++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_HINT_SYNC_AUTH_ERROR_MODERN.png.sha1
@@ -0,0 +1 @@
+6780e72c00d2c444901c5d969932ce214ca9173e
\ No newline at end of file
