settings ui: miscellaneous security keys string changes

Also reorder the fingerprint enrollment and reset items on the security
keys settings subpage.

Bug: 974046
Change-Id: Ia2b3deb6ceb5ab57f06e555216d007f52b130571
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894483Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/master@{#712636}

chrome/app/settings_strings.grdp

@@ -5185,7 +5185,7 @@
     Touch to confirm reset
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_RESET_STEP1" desc="An instruction to a user to physically unplug a security key from their computer, reinsert it, and then touch the activation button that's on the device.">
-    Remove your security key from your device, then reinsert and touch it.
+    To continue, remove your security key from your device, then reinsert and touch it
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_RESET_STEP2" desc="An instruction to a user to press the activation button on their security key a second time to confirm that they wish to reset (i.e. erase) their security key (which is an external device for user authentication).">
     Touch your security key again to confirm reset. All information stored on the security key, including its PIN, will be erased.
@@ -5202,9 +5202,6 @@
   <message name="IDS_SETTINGS_SECURITY_KEYS_RESET_NOTALLOWED" desc="A message to the user that an attempt to reset (i.e. erase) their security key (an external device for user authentication) failed because the security key refused to be reset. This is usually caused because a reset is only allowed within the first few seconds after being plugged in, so the user has to perform the operation quickly.">
     Can’t reset this security key. Try resetting the key immediately after inserting it.
   </message>
-  <message name="IDS_SETTINGS_SECURITY_KEYS_PIN_TOUCH" desc="An instruction to a user to physically the activation button on their security key (which is an external device for user authentication).">
-    Insert and touch your security key to create or change a PIN.
-  </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_NO_PIN" desc="A failure message shown to a user when they attempt to set a PIN on a security key that does not support PINs. PINs, in this context, are short, often numeric codes that are often used with, for example, ATM cards. Security keys are external devices used to authenticate people.">
     This security key doesn’t support PINs
   </message>
@@ -5266,10 +5263,10 @@
     Hide PINs
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_LABEL" desc="The label for a menu item that when clicked lets the user view and erase credentials on their security key (an authentication hardware device).">
-    Manage sign-in data
+    Sign-in data
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DESC" desc="The description for a menu item that when clicked lets the user view and erase credentials on their security key (an authentication hardware device).">
-    View and delete the sign-in data stored on your security key
+    View and delete sign-in data stored on your security key
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_TITLE" desc="The title of a dialog that lets users view and erase credentials on their security key (an authentication hardware device).">
     Security key sign-in data
@@ -5280,12 +5277,6 @@
   <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_USERNAME" desc="A column heading of a table that lists credentials stored on a security key (an authentication hardware device). This column contains the user name (e.g. exampleuser@google.com) for each credential.">
     Username
   </message>
-  <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_TOUCH" desc="A label instructing the user to physically touch the activation button on their security key (an authentication hardware device).">
-    To view sign-in data, insert and touch your security key
-  </message>
-  <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_PIN_PROMPT" desc="A label instructing the user to enter the PIN (short, often numeric codes that are often used with, for example, ATM cards) for their security key (an authentication hardware device).">
-    To view sign-in data, enter the PIN for your security key. If you don’t know the PIN, you’ll need to reset the security key.
-  </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_NO_CREDENTIALS" desc="An error message shown when a user attempts to view the credentials on their security key (an authentication hardware device) but no such credentials exist.">
     This security key does not have any sign-in data
   </message>
@@ -5307,24 +5298,21 @@
   <message name="IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_FAILED" desc="An error message shown when a user attempts to delete an individual credential on their security key (an authentication hardware device).">
     Your sign-in data couldn't be deleted
   </message>
+  <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_SUBPAGE_LABEL" desc="The label for a menu item that when clicked lets the user view, add, rename, and delete fingerprints on their security key (an authentication hardware device).">
+    Fingerprints
+  </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_SUBPAGE_DESCRIPTION" desc="The description for a menu item that when clicked lets the user view, add, rename, and delete fingerprints on their security key (an authentication hardware device).">
-    Add, rename, and delete fingerprints saved on your device
+    Add and delete fingerprints saved on your security key
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_DIALOG_TITLE" desc="The title of a dialog that lets users view, add, rename, and delete fingerprints on their security key (an authentication hardware device).">
     Manage fingerprints
   </message>
-  <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_TOUCH" desc="A label instructing the user to physically touch the activation button on their security key (an authentication hardware device).">
-    To manage your fingerprints, insert and touch your security key.
-  </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_CHOOSE_NAME" desc="A label instructing the user to provide a descriptive name for a fingerprint enrolled to a security key.">
     Choose a name for this fingerprint
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_NAME_LABEL" desc="A label for a text input field containing a descriptive name for a fingerprint enrolled to a security key.">
     Name
   </message>
-  <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_PIN_PROMPT" desc="A label instructing the user to enter the PIN (short, often numeric codes that are often used with, for example, ATM cards) for their security key (an authentication hardware device).">
-    To manage your fingerprints, enter the PIN for your security key. If you don’t know the PIN, you’ll need to reset the security key.
-  </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_NO_ENROLLMENTS" desc="A label informing the user that there are no fingerprints stored on their security key (authentication hardware device).">
     Your security key has no fingerprints stored.
   </message>
@@ -5332,9 +5320,18 @@
     Fingerprints on this security key
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLING_LABEL" desc="A label instructing the user to repeatedly touch the fingerprint sensor on their security key (authentication hardware device) to take samples for a new fingerprint.">
-    Keep touching your security key to save your fingerprint.
+    Keep touching your security key until your fingerprint is captured
+  </message>
+  <message name="IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLING_COMPLETE_LABEL" desc="A label informing the user that adding a fingerprint to their security key succeeded.">
+    Your fingerprint was captured
   </message>
   <message name="IDS_SETTINGS_SECURITY_KEYS_NO_BIOMETRIC_ENROLLMENT" desc="An error message shown when a user attempts to use the fingerprint sensor on their security key (an authentication hardware device) but the security key is not capable of storing fingerprints, or does not have a fingerprint sensor.">
     Your security key can't store fingerprints
   </message>
+  <message name="IDS_SETTINGS_SECURITY_KEYS_TOUCH_TO_CONTINUE" desc="A label instructing the user to physically touch the activation button on their security key (an authentication hardware device).">
+    To continue, insert and touch your security key
+  </message>
+  <message name="IDS_SETTINGS_SECURITY_KEYS_PIN_PROMPT" desc="A label instructing the user to enter the PIN (short, often numeric codes that are often used with, for example, ATM cards) for their security key (an authentication hardware device).">
+    Enter the PIN for your security key. If you don’t know the PIN, you’ll need to reset the security key.
+  </message>
 </grit-part>

chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.html

@@ -52,15 +52,13 @@
         <iron-pages attr-for-selected="id" selected="[[dialogPage_]]"
             on-iron-select="onIronSelect_">
           <div id="initial">
-            <p>$i18n{securityKeysBioEnrollmentTouch}</p>
+            <p>$i18n{securityKeysTouchToContinue}</p>
             <paper-spinner-lite style="padding-bottom: 16px;" active>
             </paper-spinner-lite>
           </div>
 
           <div id="pinPrompt">
-            <p>$i18n{securityKeysBioEnrollmentPinPrompt}</p>
-            <settings-security-keys-pin-field
-                id="pin" label="$i18n{securityKeysPIN}">
+            <settings-security-keys-pin-field id="pin">
             </settings-security-keys-pin-field>
           </div>
 
@@ -110,7 +108,7 @@
           </div>
 
           <div id="enroll">
-            <p>$i18n{securityKeysBioEnrollmentEnrollingLabel}</p>
+            <p>[[progressArcLabel_]]</p>
             <cr-fingerprint-progress-arc id="arc"></cr-fingerprint-progress-arc>
           </div>
 

chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.js

@@ -53,6 +53,9 @@ Polymer({
      */
     enrollments_: Array,
 
+    /** @private */
+    progressArcLabel_: String,
+
     /** @private */
     recentEnrollmentName_: String,
   },
@@ -171,6 +174,8 @@ Polymer({
 
     this.maxSamples_ = -1;  // Reset maxSamples_ before enrolling starts.
     this.$.arc.reset();
+    this.progressArcLabel_ =
+        this.i18n('securityKeysBioEnrollmentEnrollingLabel');
 
     this.recentEnrollmentId_ = '';
     this.recentEnrollmentName_ = '';
@@ -216,6 +221,8 @@ Polymer({
       this.cancelButtonVisible_ = false;
       this.confirmButtonVisible_ = true;
       this.confirmButtonDisabled_ = false;
+      this.progressArcLabel_ =
+          this.i18n('securityKeysBioEnrollmentEnrollingCompleteLabel');
       this.$.confirmButton.focus();
     }
     this.fire('bio-enroll-dialog-ready-for-testing');

chrome/browser/resources/settings/privacy_page/security_keys_credential_management_dialog.html

@@ -63,14 +63,12 @@
         <iron-pages attr-for-selected="id" selected="[[dialogPage_]]"
             on-iron-select="onIronSelect_">
           <div id="initial">
-            <p>$i18n{securityKeysCredentialManagementTouch}</p>
+            <p>$i18n{securityKeysTouchToContinue}</p>
             <paper-spinner-lite active></paper-spinner-lite>
           </div>
 
           <div id="pinPrompt">
-            <p>$i18nRaw{securityKeysCredentialManagementPinPrompt}</p>
-            <settings-security-keys-pin-field
-                id="pin" label="$i18n{securityKeysPIN}">
+            <settings-security-keys-pin-field id="pin">
             </settings-security-keys-pin-field>
           </div>
 

chrome/browser/resources/settings/privacy_page/security_keys_pin_field.html

@@ -17,11 +17,12 @@
       }
     </style>
 
+    <p>$i18n{securityKeysPINPrompt}</p>
     <cr-input id="pin" value="{{value}}" minLength="4"
         maxLength="255" spellcheck="false"
         on-input="onPINInput_"
         invalid="[[isNonEmpty_(error)]]"
-        label="[[label]]" tabindex="0"
+        label="$i18n{securityKeysPIN}" tabindex="0"
         type$="[[inputType_(inputVisible_)]]"
         error-message="[[error]]">
       <cr-icon-button slot="suffix" id="showButton"

chrome/browser/resources/settings/privacy_page/security_keys_pin_field.js

@@ -14,16 +14,13 @@ Polymer({
   ],
 
   properties: {
-    /** The label of the input field. */
-    label: String,
-
-    /** The validation error label of the input field. */
+    // The validation error label of the input field.
     error: {
       type: String,
       observer: 'errorChanged_',
     },
 
-    /** The value of the input field. */
+    // The value of the input field.
     value: String,
 
     /**

chrome/browser/resources/settings/privacy_page/security_keys_set_pin_dialog.html

@@ -42,7 +42,7 @@
         <iron-pages attr-for-selected="id" selected="[[shown_]]"
             on-iron-select="onIronSelect_">
           <div id="initial">
-            <p>$i18n{securityKeysPINTouch}</p>
+            <p>$i18n{securityKeysTouchToContinue}</p>
             <paper-spinner-lite active></paper-spinner-lite>
           </div>
 

chrome/browser/resources/settings/privacy_page/security_keys_subpage.html

@@ -27,20 +27,20 @@
         sub-label="$i18n{securityKeysCredentialManagementDesc}"
         on-click="onCredentialManagement_"></cr-link-row>
     </template>
-    <cr-link-row
-      id="resetButton"
-      class="hr"
-      label="$i18n{securityKeysReset}"
-      sub-label="$i18n{securityKeysResetDesc}"
-      on-click="onReset_"></cr-link-row>
     <template is="dom-if" if="[[enableBioEnrollment_]]">
       <cr-link-row
         id="bioEnrollButton"
         class="hr"
-        label="$i18n{securityKeysBioEnrollmentDialogTitle}"
+        label="$i18n{securityKeysBioEnrollmentSubpageLabel}"
         sub-label="$i18n{securityKeysBioEnrollmentSubpageDescription}"
         on-click="onBioEnroll_"></cr-link-row>
     </template>
+    <cr-link-row
+      id="resetButton"
+      class="hr"
+      label="$i18n{securityKeysReset}"
+      sub-label="$i18n{securityKeysResetDesc}"
+      on-click="onReset_"></cr-link-row>
 
     <template is="dom-if" if="[[showSetPINDialog_]]" restamp>
       <settings-security-keys-set-pin-dialog on-close="onSetPINDialogClosed_">

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -3271,18 +3271,18 @@ void AddSecurityKeysStrings(content::WebUIDataSource* html_source) {
   static constexpr LocalizedString kSecurityKeysStrings[] = {
       {"securityKeysBioEnrollmentDialogTitle",
        IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_DIALOG_TITLE},
+      {"securityKeysBioEnrollmentEnrollingCompleteLabel",
+       IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLING_COMPLETE_LABEL},
       {"securityKeysBioEnrollmentEnrollingLabel",
        IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLING_LABEL},
       {"securityKeysBioEnrollmentLabel",
        IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_LABEL},
       {"securityKeysBioEnrollmentNoEnrollments",
        IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_NO_ENROLLMENTS},
-      {"securityKeysBioEnrollmentPinPrompt",
-       IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_PIN_PROMPT},
       {"securityKeysBioEnrollmentSubpageDescription",
        IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_SUBPAGE_DESCRIPTION},
-      {"securityKeysBioEnrollmentTouch",
-       IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_TOUCH},
+      {"securityKeysBioEnrollmentSubpageLabel",
+       IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_SUBPAGE_LABEL},
       {"securityKeysBioEnrollmentChooseName",
        IDS_SETTINGS_SECURITY_KEYS_BIO_CHOOSE_NAME},
       {"securityKeysBioEnrollmentNameLabel",
@@ -3303,10 +3303,6 @@ void AddSecurityKeysStrings(content::WebUIDataSource* html_source) {
        IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_LABEL},
       {"securityKeysCredentialManagementNoCredentials",
        IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_NO_CREDENTIALS},
-      {"securityKeysCredentialManagementPinPrompt",
-       IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_PIN_PROMPT},
-      {"securityKeysCredentialManagementTouch",
-       IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_TOUCH},
       {"securityKeysCredentialUsername",
        IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_USERNAME},
       {"securityKeysCurrentPIN", IDS_SETTINGS_SECURITY_KEYS_CURRENT_PIN},
@@ -3327,12 +3323,12 @@ void AddSecurityKeysStrings(content::WebUIDataSource* html_source) {
        IDS_SETTINGS_SECURITY_KEYS_PIN_INCORRECT_RETRIES_SIN},
       {"securityKeysPINMismatch",
        IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_MISMATCH},
+      {"securityKeysPINPrompt", IDS_SETTINGS_SECURITY_KEYS_PIN_PROMPT},
       {"securityKeysPINSoftLock", IDS_SETTINGS_SECURITY_KEYS_PIN_SOFT_LOCK},
       {"securityKeysPINSuccess", IDS_SETTINGS_SECURITY_KEYS_PIN_SUCCESS},
       {"securityKeysPINTooLong", IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_TOO_LONG},
       {"securityKeysPINTooShort",
        IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_TOO_SHORT_SMALL},
-      {"securityKeysPINTouch", IDS_SETTINGS_SECURITY_KEYS_PIN_TOUCH},
       {"securityKeysReset", IDS_SETTINGS_SECURITY_KEYS_RESET},
       {"securityKeysResetConfirmTitle",
        IDS_SETTINGS_SECURITY_KEYS_RESET_CONFIRM_TITLE},
@@ -3355,6 +3351,8 @@ void AddSecurityKeysStrings(content::WebUIDataSource* html_source) {
        IDS_SETTINGS_SECURITY_KEYS_SET_PIN_INITIAL_TITLE},
       {"securityKeysShowPINs", IDS_SETTINGS_SECURITY_KEYS_SHOW_PINS},
       {"securityKeysTitle", IDS_SETTINGS_SECURITY_KEYS_TITLE},
+      {"securityKeysTouchToContinue",
+       IDS_SETTINGS_SECURITY_KEYS_TOUCH_TO_CONTINUE},
   };
   AddLocalizedStringsBulk(html_source, kSecurityKeysStrings,
                           base::size(kSecurityKeysStrings));