[iOS] Update tools menu VoiceOver

This CL removes the default VoiceOver action which is reading the title
of the item then the content of the badge.
Now the accessibility label is the title and a new property,
|additionalAccessibilityLabel|, if it is set.

This is a reland of crrev.com/c/1789397, fixing the failing tests.

Bug: 985764
Change-Id: I6abef0554fd30463d3381de7baf000752cafeb39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1833475Reviewed-by: Justin Cohen <justincohen@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702782}

ios/chrome/app/strings/ios_strings.grd

@@ -591,10 +591,10 @@ locale.  The strings in this file are specific to iOS.
         Reading List
       </message>
       <message name="IDS_IOS_CONTENT_SUGGESTIONS_READING_LIST_ACCESSIBILITY_LABEL_ONE_UNREAD" desc="The accessibility label to use for the reading list content suggestion cell when there is only a single unread article [Length: unlimited]">
-        1 unread Reading List article.
+        1 unread article.
       </message>
       <message name="IDS_IOS_CONTENT_SUGGESTIONS_READING_LIST_ACCESSIBILITY_LABEL" desc="The accessibility label to use for the reading list content suggestion cell when there are multiple unread articles [Length: unlimited]">
-        <ph name="UNREAD_COUNT">$1<ex>4</ex></ph> unread Reading List articles.
+        <ph name="UNREAD_COUNT">$1<ex>4</ex></ph> unread articles.
       </message>
       <message name="IDS_IOS_CONTENT_SUGGESTIONS_RECENT_TABS" desc="The Recent Tabs title on the new tab page [Length: 10em]">
         Recent Tabs

ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

@@ -388,7 +388,12 @@ std::unique_ptr<net::test_server::HttpResponse> LoadFrenchPage(
       assertWithMatcher:grey_notNil()];
 
   // Close tools menu by tapping reload.
-  [[[EarlGrey selectElementWithMatcher:chrome_test_util::ReloadButton()]
+  [[[EarlGrey
+      selectElementWithMatcher:grey_allOf(
+                                   chrome_test_util::ReloadButton(),
+                                   grey_ancestor(
+                                       chrome_test_util::ToolsMenuView()),
+                                   nil)]
          usingSearchAction:grey_scrollInDirection(kGREYDirectionUp, 150)
       onElementWithMatcher:chrome_test_util::ToolsMenuView()]
       performAction:grey_tap()];

ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.mm

@@ -79,7 +79,9 @@
   }
 
   self.accessibilityLabel =
-      AccessibilityLabelForReadingListCellWithCount(self.count);
+      [NSString stringWithFormat:@"%@, %@", self.title,
+                                 AccessibilityLabelForReadingListCellWithCount(
+                                     self.count)];
   DCHECK(self.accessibilityLabel.length);
 }
 

ios/chrome/browser/ui/omnibox/popup/shortcuts/shortcuts_view_controller.mm

@@ -195,8 +195,10 @@ const CGFloat kTopInset = 10;
     if (self.readingListBadgeValue > 0) {
       cell.tile.countLabel.text = [@(self.readingListBadgeValue) stringValue];
       cell.tile.countContainer.hidden = NO;
-      cell.accessibilityLabel = AccessibilityLabelForReadingListCellWithCount(
-          self.readingListBadgeValue);
+      cell.accessibilityLabel = [NSString
+          stringWithFormat:@"%@, %@", cell.accessibilityLabel,
+                           AccessibilityLabelForReadingListCellWithCount(
+                               self.readingListBadgeValue)];
     }
   }
 }

ios/chrome/browser/ui/popup_menu/BUILD.gn

@@ -62,6 +62,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/ntp_tile_views:constants",
     "//ios/chrome/browser/ui/popup_menu/cells",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",

ios/chrome/browser/ui/popup_menu/cells/popup_menu_tools_item.h

@@ -17,14 +17,18 @@
 @property(nonatomic, strong) UIImage* image;
 // Whether the cell associated with this item should be enabled.
 @property(nonatomic, assign) BOOL enabled;
-// Number to be displayed in the badge. If 0, the badge is hidden.
+// Number to be displayed in the badge. If 0, the badge is hidden. This is not
+// read by VoiceOver.
 @property(nonatomic, assign) NSInteger badgeNumber;
 // Text to be displayed in the badge. Set to nil to hide the badge. The text
-// badge is only displayed if the numbered badge is hidden.
+// badge is only displayed if the numbered badge is hidden. This is not read by
+// VoiceOver.
 @property(nonatomic, copy) NSString* badgeText;
 // Whether the item is associated with a destructive action. If |YES|, then a
 // specific styling is applied.
 @property(nonatomic, assign) BOOL destructiveAction;
+// Additional label. Read after |title| if not nil.
+@property(nonatomic, strong) NSString* additionalAccessibilityLabel;
 
 @end
 
@@ -41,6 +45,9 @@
 // specific styling is applied.
 @property(nonatomic, assign) BOOL destructiveAction;
 
+// Additional label. Read after |title| if not nil.
+@property(nonatomic, strong) NSString* additionalAccessibilityLabel;
+
 // Sets the number on the badge number.
 - (void)setBadgeNumber:(NSInteger)badgeNumber;
 // Sets the text of the badge text. Hides the badge text if |badgeText| is nil.

ios/chrome/browser/ui/popup_menu/cells/popup_menu_tools_item.mm

@@ -34,12 +34,6 @@ NSString* const kToolsMenuTextBadgeAccessibilityIdentifier =
 @implementation PopupMenuToolsItem
 
 @synthesize actionIdentifier = _actionIdentifier;
-@synthesize badgeNumber = _badgeNumber;
-@synthesize badgeText = _badgeText;
-@synthesize image = _image;
-@synthesize title = _title;
-@synthesize enabled = _enabled;
-@synthesize destructiveAction = _destructiveAction;
 
 - (instancetype)initWithType:(NSInteger)type {
   self = [super initWithType:type];
@@ -60,6 +54,7 @@ NSString* const kToolsMenuTextBadgeAccessibilityIdentifier =
   cell.destructiveAction = self.destructiveAction;
   [cell setBadgeNumber:self.badgeNumber];
   [cell setBadgeText:self.badgeText];
+  cell.additionalAccessibilityLabel = self.additionalAccessibilityLabel;
 }
 
 #pragma mark - PopupMenuItem
@@ -104,11 +99,6 @@ NSString* const kToolsMenuTextBadgeAccessibilityIdentifier =
 @implementation PopupMenuToolsCell
 
 @synthesize imageView = _imageView;
-@synthesize numberBadgeView = _numberBadgeView;
-@synthesize textBadgeView = _textBadgeView;
-@synthesize titleLabel = _titleLabel;
-@synthesize titleToBadgeConstraint = _titleToBadgeConstraint;
-@synthesize destructiveAction = _destructiveAction;
 
 - (instancetype)initWithStyle:(UITableViewCellStyle)style
               reuseIdentifier:(NSString*)reuseIdentifier {
@@ -316,6 +306,17 @@ NSString* const kToolsMenuTextBadgeAccessibilityIdentifier =
   }
 }
 
+#pragma mark - Accessibility
+
+- (NSString*)accessibilityLabel {
+  if (self.additionalAccessibilityLabel) {
+    return [NSString stringWithFormat:@"%@, %@", self.titleLabel.text,
+                                      self.additionalAccessibilityLabel];
+  } else {
+    return self.titleLabel.text;
+  }
+}
+
 #pragma mark - Private
 
 // Callback when the preferred Content Size change.

ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm

@@ -29,6 +29,7 @@
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/commands/reading_list_add_command.h"
 #import "ios/chrome/browser/ui/list_model/list_model.h"
+#import "ios/chrome/browser/ui/ntp_tile_views/ntp_tile_constants.h"
 #import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_navigation_item.h"
 #import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_tools_item.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
@@ -899,8 +900,13 @@ PopupMenuToolsItem* CreateTableViewItem(int titleID,
   self.readingListItem = CreateTableViewItem(
       IDS_IOS_TOOLS_MENU_READING_LIST, PopupMenuActionReadingList,
       @"popup_menu_reading_list", kToolsMenuReadingListId);
-  self.readingListItem.badgeNumber =
+  NSInteger numberOfUnreadArticles =
       [self.readingListMenuNotifier readingListUnreadCount];
+  self.readingListItem.badgeNumber = numberOfUnreadArticles;
+  if (numberOfUnreadArticles) {
+    self.readingListItem.additionalAccessibilityLabel =
+        AccessibilityLabelForReadingListCellWithCount(numberOfUnreadArticles);
+  }
   if (self.engagementTracker &&
       self.engagementTracker->ShouldTriggerHelpUI(
           feature_engagement::kIPHBadgedReadingListFeature)) {