Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm

Issue 2625423003: [ios] Fix settings switch accessibility value and hint (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm
diff --git a/ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm b/ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm
index cd6f56b8978bf14303f54a7bcb51b49fdc25d7c6..b427959b143eb4421b42658db0397a07c8bf2b7e 100644
--- a/ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm
+++ b/ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.mm
@@ -5,8 +5,10 @@
#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."
@@ -31,7 +33,6 @@ const CGFloat kVerticalPadding = 16;
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
}
return self;
}
@@ -74,6 +75,8 @@ const CGFloat kVerticalPadding = 16;
_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.
@@ -138,7 +141,11 @@ const CGFloat kVerticalPadding = 16;
}
- (NSString*)accessibilityHint {
- return _switchView.accessibilityHint;
+ if (_switchView.isEnabled) {
+ return _switchView.accessibilityHint;
+ } else {
+ return @"";
+ }
}
- (NSString*)accessibilityLabel {
@@ -146,7 +153,11 @@ const CGFloat kVerticalPadding = 16;
}
- (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

Powered by Google App Engine
This is Rietveld 408576698