[ios] Fix settings switch accessibility value and hint

ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.h"
 
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
+#include "ios/chrome/grit/ios_strings.h"
 #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
+#include "ui/base/l10n/l10n_util_mac.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 // Padding used on the leading and trailing edges of the cell.
 const CGFloat kHorizontalPadding = 16;
 
 // Padding used on the top and bottom edges of the cell.
 const CGFloat kVerticalPadding = 16;
 }  // namespace
 
 @implementation CollectionViewSwitchItem
 
 @synthesize text = _text;
 @synthesize on = _on;
 @synthesize enabled = _enabled;
 
 - (instancetype)initWithType:(NSInteger)type {
   self = [super initWithType:type];
   if (self) {
     self.cellClass = [CollectionViewSwitchCell class];
     self.enabled = YES;
-    self.accessibilityTraits |= UIAccessibilityTraitButton;

[lpromero, 2017/01/13 10:01:33]

No action needed: Agreed. Being as similar to iOS Settings app as possible is a
good thing.

   }
   return self;
 }
 
 #pragma mark CollectionViewItem
 
 - (void)configureCell:(CollectionViewSwitchCell*)cell {
   [super configureCell:cell];
   cell.textLabel.text = self.text;
   cell.switchView.enabled = self.isEnabled;
@@ skipping 22 matching lines @@
     [self.contentView addSubview:_textLabel];
 
     _textLabel.font =
         [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14];
     _textLabel.textColor = [[MDCPalette greyPalette] tint900];
     _textLabel.numberOfLines = 0;
 
     _switchView = [[UISwitch alloc] initWithFrame:CGRectZero];
     _switchView.translatesAutoresizingMaskIntoConstraints = NO;
     _switchView.onTintColor = [[MDCPalette cr_bluePalette] tint500];
+    _switchView.accessibilityHint = l10n_util::GetNSString(
+        IDS_IOS_TOGGLE_SETTING_SWITCH_ACCESSIBILITY_HINT);
     [self.contentView addSubview:_switchView];
 
     // Set up the constraints.
     [NSLayoutConstraint activateConstraints:@[
       [_textLabel.leadingAnchor
           constraintEqualToAnchor:self.contentView.leadingAnchor
                          constant:kHorizontalPadding],
       [_switchView.trailingAnchor
           constraintEqualToAnchor:self.contentView.trailingAnchor
                          constant:-kHorizontalPadding],
@@ skipping 44 matching lines @@
 
 - (CGPoint)accessibilityActivationPoint {
   // Center the activation point over the switch, so that double-tapping toggles
   // the switch.
   CGRect switchFrame =
       UIAccessibilityConvertFrameToScreenCoordinates(_switchView.frame, self);
   return CGPointMake(CGRectGetMidX(switchFrame), CGRectGetMidY(switchFrame));
 }
 
 - (NSString*)accessibilityHint {
-  return _switchView.accessibilityHint;
+  if (_switchView.isEnabled) {
+    return _switchView.accessibilityHint;
+  } else {
+    return @"";
+  }
 }
 
 - (NSString*)accessibilityLabel {
   return _textLabel.text;
 }
 
 - (NSString*)accessibilityValue {
-  return _switchView.accessibilityValue;
+  if (_switchView.on) {
+    return l10n_util::GetNSString(IDS_IOS_SETTING_ON);
+  } else {
+    return l10n_util::GetNSString(IDS_IOS_SETTING_OFF);
+  }
 }
 
 @end