(Merge): [iOS][Safety Check] Add new default strings for Safety Check
Adds new default strings to safety check so that rows don't resize.
Running state keeps the same detail text as the previous state.
(cherry picked from commit 2a1ff9bef62cfdba2baeadac0fffce43e7baf4b0)
Bug: 1078782, 1135095
Change-Id: Iffa246a5baca2b2cf8051e87cc10a1d6d80f6c2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443729
Reviewed-by: Martin Šrámek <[email protected]>
Commit-Queue: Sean Harrison <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#812977}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453739
Reviewed-by: Sean Harrison <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#68}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/strings/ios_chromium_strings.grd
index b2e29c7..e2e28c0 100644
--- a/ios/chrome/app/strings/ios_chromium_strings.grd
+++ b/ios/chrome/app/strings/ios_chromium_strings.grd
@@ -325,6 +325,9 @@
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PAGE_HEADER" desc="Informational header at the top of the safety check page">
Chromium can help keep you safe from data breaches, unsafe websites and more.
</message>
+ <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION" desc="Description text on the update element describing what the update check does.">
+ Keep Chromium up to date
+ </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_CHANNEL_CANARY_DESC" desc="Description text for when the app is on Canary and unable to run the check">
Not supported on Chromium Canary
</message>
diff --git a/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION.png.sha1 b/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION.png.sha1
new file mode 100644
index 0000000..b12cf4ee
--- /dev/null
+++ b/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION.png.sha1
@@ -0,0 +1 @@
+0935cf19143c008554f328bad3990520df8be283
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/app/strings/ios_google_chrome_strings.grd
index a47bacb1..67609092 100644
--- a/ios/chrome/app/strings/ios_google_chrome_strings.grd
+++ b/ios/chrome/app/strings/ios_google_chrome_strings.grd
@@ -325,6 +325,9 @@
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PAGE_HEADER" desc="Informational header at the top of the safety check page">
Chrome can help keep you safe from data breaches, unsafe websites and more.
</message>
+ <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION" desc="Description text on the update element describing what the update check does.">
+ Keep Chrome up to date
+ </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_CHANNEL_CANARY_DESC" desc="Description text for when the app is on Canary and unable to run the check">
Not supported on Chrome Canary
</message>
diff --git a/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION.png.sha1 b/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION.png.sha1
new file mode 100644
index 0000000..9c11fb48
--- /dev/null
+++ b/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION.png.sha1
@@ -0,0 +1 @@
+727fadd7b29bcbfe0525ed2a2fd8ca056561f66e
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd
index 80035a9..13bff85 100644
--- a/ios/chrome/app/strings/ios_strings.grd
+++ b/ios/chrome/app/strings/ios_strings.grd
@@ -1795,9 +1795,15 @@
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_TITLE" desc="Title for the passwords element of safety check" meaning="Row title to access the passowrd check subpage if a probelm is found with user's saved passwords [CHAR_LIMIT=20]">
Passwords
</message>
+ <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION" desc="Description text on the password element describing what the password check does.">
+ Check for compromised passwords
+ </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_TITLE" desc="Title for the safe browsing element of safety check" meaning="Row title to display the user's safe browsing status [CHAR_LIMIT=20]">
Safe Browsing
</message>
+ <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION" desc="Description text on the Safe Browsing element describing what the Safe Browsing check does.">
+ Stay protected from dangerous websites
+ </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_DESC" desc="Detail text for the Safe Browsing check if the user has Safe Browsing disabled">
Off - Not recommended
</message>
diff --git a/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION.png.sha1 b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION.png.sha1
new file mode 100644
index 0000000..b12cf4ee
--- /dev/null
+++ b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@
+0935cf19143c008554f328bad3990520df8be283
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION.png.sha1 b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION.png.sha1
new file mode 100644
index 0000000..b12cf4ee
--- /dev/null
+++ b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION.png.sha1
@@ -0,0 +1 @@
+0935cf19143c008554f328bad3990520df8be283
\ No newline at end of file
diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
index e02689e2..2dafa4e 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
@@ -873,7 +873,6 @@
self.updateCheckItem.enabled = YES;
self.updateCheckItem.indicatorHidden = YES;
self.updateCheckItem.infoButtonHidden = YES;
- self.updateCheckItem.detailText = nil;
self.updateCheckItem.trailingImage = nil;
self.updateCheckItem.trailingImageTintColor = nil;
self.updateCheckItem.accessoryType = UITableViewCellAccessoryNone;
@@ -882,8 +881,11 @@
[self resetsCheckStartItemIfNeeded];
switch (self.updateCheckRowState) {
- case UpdateCheckRowStateDefault:
+ case UpdateCheckRowStateDefault: {
+ self.updateCheckItem.detailText =
+ GetNSString(IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION);
break;
+ }
case UpdateCheckRowStateRunning: {
self.updateCheckItem.indicatorHidden = NO;
break;
@@ -958,7 +960,6 @@
self.passwordCheckItem.enabled = YES;
self.passwordCheckItem.indicatorHidden = YES;
self.passwordCheckItem.infoButtonHidden = YES;
- self.passwordCheckItem.detailText = nil;
self.passwordCheckItem.trailingImage = nil;
self.passwordCheckItem.trailingImageTintColor = nil;
self.passwordCheckItem.accessoryType = UITableViewCellAccessoryNone;
@@ -967,8 +968,11 @@
[self resetsCheckStartItemIfNeeded];
switch (self.passwordCheckRowState) {
- case PasswordCheckRowStateDefault:
+ case PasswordCheckRowStateDefault: {
+ self.passwordCheckItem.detailText =
+ GetNSString(IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION);
break;
+ }
case PasswordCheckRowStateRunning: {
self.passwordCheckItem.indicatorHidden = NO;
break;
@@ -1018,7 +1022,6 @@
self.safeBrowsingCheckItem.enabled = YES;
self.safeBrowsingCheckItem.indicatorHidden = YES;
self.safeBrowsingCheckItem.infoButtonHidden = YES;
- self.safeBrowsingCheckItem.detailText = nil;
self.safeBrowsingCheckItem.trailingImage = nil;
self.safeBrowsingCheckItem.trailingImageTintColor = nil;
self.safeBrowsingCheckItem.accessoryType = UITableViewCellAccessoryNone;
@@ -1027,8 +1030,11 @@
[self resetsCheckStartItemIfNeeded];
switch (self.safeBrowsingCheckRowState) {
- case SafeBrowsingCheckRowStateDefault:
+ case SafeBrowsingCheckRowStateDefault: {
+ self.safeBrowsingCheckItem.detailText =
+ GetNSString(IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION);
break;
+ }
case SafeBrowsingCheckRowStateRunning: {
self.safeBrowsingCheckItem.indicatorHidden = NO;
break;
