Commit a11e3884 authored by Jordy Greenblatt's avatar Jordy Greenblatt Committed by Commit Bot

[CrOS MultiDevice] Settings UI A11y labels.


Bug: 876796
Change-Id: Ie369384f218fde83ae03f21add99c0573ab97912
Reviewed-on: https://chromium-review.googlesource.com/1211915Reviewed-by: default avatarJeremy Klein <jlklein@chromium.org>
Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589397}
parent 54371ca8
...@@ -92,6 +92,8 @@ const MultiDeviceFeatureBehaviorImpl = { ...@@ -92,6 +92,8 @@ const MultiDeviceFeatureBehaviorImpl = {
*/ */
getFeatureName: function(feature) { getFeatureName: function(feature) {
switch (feature) { switch (feature) {
case settings.MultiDeviceFeature.BETTER_TOGETHER_SUITE:
return this.i18n('multideviceSetupItemHeading');
case settings.MultiDeviceFeature.INSTANT_TETHERING: case settings.MultiDeviceFeature.INSTANT_TETHERING:
return this.i18n('multideviceInstantTetheringItemTitle'); return this.i18n('multideviceInstantTetheringItemTitle');
case settings.MultiDeviceFeature.MESSAGES: case settings.MultiDeviceFeature.MESSAGES:
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
subpageRoute, pageContentData, feature)]]"> subpageRoute, pageContentData, feature)]]">
<iron-icon icon="[[getIconName(feature)]]"></iron-icon> <iron-icon icon="[[getIconName(feature)]]"></iron-icon>
<div id="item-text-container" class="middle"> <div id="item-text-container" class="middle">
[[getFeatureName(feature)]] <div id="featureName">[[getFeatureName(feature)]]</div>
<div class="secondary" <div class="secondary"
id="featureSecondary" id="featureSecondary"
inner-h-t-m-l="[[getFeatureSummaryHtml(feature)]]"> inner-h-t-m-l="[[getFeatureSummaryHtml(feature)]]">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
subpageRoute, pageContentData, feature)]]" subpageRoute, pageContentData, feature)]]"
restamp> restamp>
<paper-icon-button-light class="subpage-arrow"> <paper-icon-button-light class="subpage-arrow">
<button aria-label="[[getFeatureName(feature)]]" <button aria-labelledby="featureName"
aria-describedby="featureSecondary"></button> aria-describedby="featureSecondary"></button>
</paper-icon-button-light> </paper-icon-button-light>
<div class="separator"></div> <div class="separator"></div>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<dom-module id="settings-multidevice-feature-toggle"> <dom-module id="settings-multidevice-feature-toggle">
<template> <template>
<cr-toggle id="toggle" <cr-toggle id="toggle"
aria-label$="[[getFeatureName(feature)]]"
checked="{{checked_}}" checked="{{checked_}}"
disabled="[[!isFeatureStateEditable(feature, pageContentData)]]" disabled="[[!isFeatureStateEditable(feature, pageContentData)]]"
on-change="onChange_"> on-change="onChange_">
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
if="[[doesClickOpenSubpage_(pageContentData)]]" if="[[doesClickOpenSubpage_(pageContentData)]]"
restamp> restamp>
<paper-icon-button-light class="subpage-arrow"> <paper-icon-button-light class="subpage-arrow">
<button aria-label="[[getLabelText_(pageContentData)]]" <button aria-labelledby="multidevice-label"
aria-describedby="mutltideviceSubLabel"></button> aria-describedby="mutltideviceSubLabel"></button>
</paper-icon-button-light> </paper-icon-button-light>
</template> </template>
......
...@@ -123,7 +123,6 @@ ...@@ -123,7 +123,6 @@
on-click="onForgetDeviceDialogCancelClick_"> on-click="onForgetDeviceDialogCancelClick_">
$i18n{cancel} $i18n{cancel}
</paper-button> </paper-button>
<paper-button id="confirmButton" <paper-button id="confirmButton"
class="action-button" class="action-button"
on-click="onForgetDeviceDialogConfirmClick_"> on-click="onForgetDeviceDialogConfirmClick_">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment