Content description for settings button in keyboard accessory.

A screen reader should verbalise "settings" instead of "autofill settings three dots" when the user taps the gear icon on the keyboard accessory. BUG=428087 Review URL: https://codereview.chromium.org/1357243003 Cr-Commit-Position: refs/heads/master@{#350040}
qweri0p · Sep 21, 2015 · 7647c0a · 7647c0a
1 parent ba54519
commit 7647c0a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
@@ -172,6 +172,7 @@ IDS_AUTOFILL_FIELD_LABEL_PREFECTURE
 IDS_AUTOFILL_FIELD_LABEL_PROVINCE
 IDS_AUTOFILL_FIELD_LABEL_STATE
 IDS_AUTOFILL_FIELD_LABEL_ZIP_CODE
+IDS_AUTOFILL_OPTIONS_CONTENT_DESCRIPTION
 IDS_AUTOFILL_OPTIONS_POPUP
 IDS_AUTOFILL_PASSWORD_FIELD_SUGGESTIONS_TITLE
 IDS_AUTOFILL_SCAN_CREDIT_CARD

diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -293,8 +293,11 @@ void AutofillExternalDelegate::ApplyAutofillOptions(
   }
 
   // Append the 'Chrome Autofill options' menu item;
-  suggestions->push_back(Suggestion(
-      l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_POPUP)));
+  // TODO(rouslan): Switch on the platform in the GRD file when keyboard
+  // accessory becomes default on Android.
+  suggestions->push_back(Suggestion(l10n_util::GetStringUTF16(
+      IsKeyboardAccessoryEnabled() ? IDS_AUTOFILL_OPTIONS_CONTENT_DESCRIPTION
+                                   : IDS_AUTOFILL_OPTIONS_POPUP)));
   suggestions->back().frontend_id = POPUP_ITEM_ID_AUTOFILL_OPTIONS;
   if (IsKeyboardAccessoryEnabled())
     suggestions->back().icon = base::ASCIIToUTF16("settings");

diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp
@@ -126,6 +126,9 @@
       Chromium Autofill settings...
     </message>
   </if>
+  <message name="IDS_AUTOFILL_OPTIONS_CONTENT_DESCRIPTION" desc="The text verbalised by a screen reader for the button that directs the user to the Autofill settings UI. This string is not displayed.">
+    settings
+  </message>
 
   <message name="IDS_AUTOFILL_CREDIT_CARD_NOT_SUPPORTED_BY_WALLET" desc="Message displayed to user when user entered a credit card number that is not supported by Google Payments.">
     This type of card is not supported by Google Payments. Please select a different card.