Commit 7d691a6b authored by Yuki Shiino's avatar Yuki Shiino Committed by Commit Bot

Revert "[CrOS MultiDevice] Settings UI A11y labels."

This reverts commit a11e3884.

Reason for revert: Suspicious to have broken viz_browser_tests and webui_polymer2_browser_tests.
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/linux-chromeos-dbg/7689
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8936081737798843840/+/steps/viz_browser_tests/0/logs/CrSettingsMultideviceFeatureToggleTest.All/0

Original change's description:
> [CrOS MultiDevice] Settings UI A11y labels.
> 
> 
> Bug: 876796
> Change-Id: Ie369384f218fde83ae03f21add99c0573ab97912
> Reviewed-on: https://chromium-review.googlesource.com/1211915
> Reviewed-by: Jeremy Klein <jlklein@chromium.org>
> Reviewed-by: Hector Carmona <hcarmona@chromium.org>
> Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#589397}

TBR=hcarmona@chromium.org,jlklein@chromium.org,jordynass@chromium.org

Change-Id: Ife1c75063e197a32142604f3f05c964910721079
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 876796
Reviewed-on: https://chromium-review.googlesource.com/1212212Reviewed-by: default avatarYuki Shiino <yukishiino@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589469}
parent d5e1dcb4
......@@ -92,8 +92,6 @@ const MultiDeviceFeatureBehaviorImpl = {
*/
getFeatureName: function(feature) {
switch (feature) {
case settings.MultiDeviceFeature.BETTER_TOGETHER_SUITE:
return this.i18n('multideviceSetupItemHeading');
case settings.MultiDeviceFeature.INSTANT_TETHERING:
return this.i18n('multideviceInstantTetheringItemTitle');
case settings.MultiDeviceFeature.MESSAGES:
......
......@@ -36,7 +36,7 @@
subpageRoute, pageContentData, feature)]]">
<iron-icon icon="[[getIconName(feature)]]"></iron-icon>
<div id="item-text-container" class="middle">
<div id="featureName">[[getFeatureName(feature)]]</div>
[[getFeatureName(feature)]]
<div class="secondary"
id="featureSecondary"
inner-h-t-m-l="[[getFeatureSummaryHtml(feature)]]">
......@@ -47,7 +47,7 @@
subpageRoute, pageContentData, feature)]]"
restamp>
<paper-icon-button-light class="subpage-arrow">
<button aria-labelledby="featureName"
<button aria-label="[[getFeatureName(feature)]]"
aria-describedby="featureSecondary"></button>
</paper-icon-button-light>
<div class="separator"></div>
......
......@@ -8,7 +8,6 @@
<dom-module id="settings-multidevice-feature-toggle">
<template>
<cr-toggle id="toggle"
aria-label$="[[getFeatureName(feature)]]"
checked="{{checked_}}"
disabled="[[!isFeatureStateEditable(feature, pageContentData)]]"
on-change="onChange_">
......
......@@ -63,7 +63,7 @@
if="[[doesClickOpenSubpage_(pageContentData)]]"
restamp>
<paper-icon-button-light class="subpage-arrow">
<button aria-labelledby="multidevice-label"
<button aria-label="[[getLabelText_(pageContentData)]]"
aria-describedby="mutltideviceSubLabel"></button>
</paper-icon-button-light>
</template>
......
......@@ -123,6 +123,7 @@
on-click="onForgetDeviceDialogCancelClick_">
$i18n{cancel}
</paper-button>
<paper-button id="confirmButton"
class="action-button"
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