[Switch Access] Update strings in assignment dialog

Update strings to match go/switch-access-setup-strings-doc

Fixed: 1161112
AX-Relnotes: N/a.
Change-Id: If86c68a5ee341ed9d207c3f10240fc4d44d561c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2599389
Commit-Queue: Josiah Krutz <josiahk@google.com>
Reviewed-by: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839799}

chrome/app/os_settings_strings.grdp

@@ -999,8 +999,8 @@
   <message name="IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_TITLE" desc="A title for a dialog to assign a switch key to an action. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
     Assign switch: <ph name="action">$1<ex>Select</ex></ph>
   </message>
-  <message name="IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WAIT_FOR_KEY_PROMPT_NO_SWITCHES" desc="A message shown to ask a user to press a new key to be assigned to an action. No switches are currently assigned to this action. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
-    Press a new switch to start assignment.
+  <message name="IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WAIT_FOR_KEY_PROMPT_NO_SWITCHES" desc="A message shown to ask a user to press a new key to be assigned to an action. No switches are currently assigned to this action. The user can assign multiple switches to this action. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
+    Press a switch to assign “<ph name="action">$1<ex>Select</ex></ph>”. You can assign multiple switches to this action.
   </message>
   <message name="IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WAIT_FOR_KEY_PROMPT_AT_LEAST_ONE_SWITCH" desc="A message shown to ask a user to press a key to be assigned to an action, or press an assigned switch to remove assignment. One or more switches are currently assigned to this action. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
     Press a new switch to start assignment.
@@ -1013,10 +1013,10 @@ Press an assigned switch to remove assignment.
     Press “<ph name="currentKey">$1<ex>backspace</ex></ph>” again to remove assignment and exit.
   </message>
   <message name="IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WARN_NOT_CONFIRMED_PROMPT" desc="A message warning the user that the switch key pressed during confirmation did not match the initial switch key pressed. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
-    Keys do not match. “<ph name="unexpectedKey">$1<ex>enter</ex></ph>” was pressed. “<ph name="currentKey">$2<ex>backspace</ex></ph>” was pressed before. Press any key to exit.
+    Keys do not match. Press any key to exit.
   </message>
   <message name="IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WARN_CANNOT_REMOVE_LAST_SELECT_SWITCH" desc="A message warning the user that they cannot remove the last switch for the Select action. The text for the 'Select' action should be the same as the text from IDS_SETTINGS_ASSIGN_SELECT_SWITCH_LABEL. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
-    Couldn't remove the only switch assigned to Select. Press any key to exit.
+    Can’t remove the only switch assigned to Select. Press any key to exit.
   </message>
   <message name="IDS_SETTINGS_ASSIGN_SWITCH_SUB_LABEL_0_SWITCHES" desc="A sub-label for the link that brings up a dialog to assign a switch key to an action. Mentions zero switches assigned. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
     0 switches assigned

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WAIT_FOR_KEY_PROMPT_NO_SWITCHES.png.sha1

-b14090832131315ecb83e68967b8c2a3f1daac9a
\ No newline at end of file
+15ee6bb5dc6f28957f3927ca92d46d8dab694a8c
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WARN_CANNOT_REMOVE_LAST_SELECT_SWITCH.png.sha1

-b6f7099a92f1ae4de9e58c63994179379018902e
\ No newline at end of file
+bdf360c94294cf0f89939e3aed405ae28aec1bcb
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SWITCH_ACCESS_ACTION_ASSIGNMENT_DIALOG_WARN_NOT_CONFIRMED_PROMPT.png.sha1

-50399f24500516b7cb529f26af2b0fd1893065c3
\ No newline at end of file
+9fc79913e1446ecd43c53cb00fec04c981ae5235
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_action_assignment_dialog.js

@@ -338,7 +338,8 @@ Polymer({
       case AssignmentState.WARN_CANNOT_REMOVE_LAST_SELECT_SWITCH:
         if (!assignments.length) {
           return this.i18n(
-              'switchAccessActionAssignmentDialogWaitForKeyPromptNoSwitches');
+              'switchAccessActionAssignmentDialogWaitForKeyPromptNoSwitches',
+              this.getLabelForAction_(this.action));
         }
         return this.i18n(
             'switchAccessActionAssignmentDialogWaitForKeyPromptAtLeastOneSwitch');
@@ -366,8 +367,7 @@ Polymer({
       case AssignmentState.WARN_NOT_CONFIRMED:
       case AssignmentState.WARN_NOT_CONFIRMED_REMOVAL:
         return this.i18n(
-            'switchAccessActionAssignmentDialogWarnNotConfirmedPrompt',
-            this.unexpectedKey_, this.currentKey_);
+            'switchAccessActionAssignmentDialogWarnNotConfirmedPrompt');
       case AssignmentState.WARN_ALREADY_ASSIGNED_ACTION:
         return this.i18n(
             'switchAccessActionAssignmentDialogWarnAlreadyAssignedActionPrompt',

chrome/test/data/webui/settings/chromeos/switch_access_subpage_tests.js

@@ -200,10 +200,7 @@ suite('ManageAccessibilityPageTests', function() {
     const errorText = page.$$('#switchAccessActionAssignmentDialog')
                           .$$('#error')
                           .textContent.trim();
-    assertEquals(
-        'Keys do not match. “b” was pressed. “a” was pressed before. ' +
-            'Press any key to exit.',
-        errorText);
+    assertEquals('Keys do not match. Press any key to exit.', errorText);
   });
 
   test('Deep link to auto-scan keyboards', async () => {