Commit e09496d0 authored by Azeem Arshad's avatar Azeem Arshad Committed by Commit Bot

[CrOS A11y] Improve label for multidevice suite toggle.

This CL updates the label for multidevice suite toggle
from "Android phone" to "Connected phone features enable". This
makes it consistent with other feature toggles in the settings
main page.

https://screenshot.googleplex.com/6PzrfqVEj2kLUNW

Bug: 1009143
Change-Id: I50d0851adc5136b8c593b597fa481571ec44cc47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462253
Commit-Queue: Azeem Arshad <azeemarshad@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815412}
parent e4d892e1
...@@ -2251,6 +2251,9 @@ ...@@ -2251,6 +2251,9 @@
<message name="IDS_SETTINGS_MULTIDEVICE_DISABLED" desc="Text to tell user multidevice features are turned off"> <message name="IDS_SETTINGS_MULTIDEVICE_DISABLED" desc="Text to tell user multidevice features are turned off">
Disabled Disabled
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_SUITE_TOGGLE_A11Y_LABEL" desc="Accessibility label for toggle button that enables/disables connected phone features.">
Connected phone features enable.
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING" desc="Name of a feature. This feature automatically offers the user to tether to their phone if their Chromebook is offline and their phone supports tethering."> <message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING" desc="Name of a feature. This feature automatically offers the user to tether to their phone if their Chromebook is offline and their phone supports tethering.">
Instant Tethering Instant Tethering
</message> </message>
......
9e5e5aaf9ba7a41324fa8777bb9badcd64654adf
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +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)]]" aria-label$="[[getToggleA11yLabel_(feature)]]"
checked="{{checked_}}" checked="{{checked_}}"
disabled="[[!isFeatureStateEditable(feature, pageContentData)]]" disabled="[[!isFeatureStateEditable(feature, pageContentData)]]"
on-change="onChange_"> on-change="onChange_">
......
...@@ -19,6 +19,8 @@ Polymer({ ...@@ -19,6 +19,8 @@ Polymer({
/** @type {!settings.MultiDeviceFeature} */ /** @type {!settings.MultiDeviceFeature} */
feature: Number, feature: Number,
toggleAriaLabel: String,
/** @private {boolean} */ /** @private {boolean} */
checked_: Boolean, checked_: Boolean,
}, },
...@@ -78,4 +80,12 @@ Polymer({ ...@@ -78,4 +80,12 @@ Polymer({
'feature-toggle-clicked', 'feature-toggle-clicked',
{feature: this.feature, enabled: !this.checked_}); {feature: this.feature, enabled: !this.checked_});
}, },
/**
* Returns the A11y label for the toggle.
* @private
*/
getToggleA11yLabel_() {
return this.toggleAriaLabel || this.getFeatureName(this.feature);
}
}); });
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
</cr-policy-indicator> </cr-policy-indicator>
<settings-multidevice-feature-toggle <settings-multidevice-feature-toggle
class="margin-matches-padding" class="margin-matches-padding"
toggle-aria-label="$i18n{multideviceSuiteToggleA11yLabel}"
feature="[[MultiDeviceFeature.BETTER_TOGETHER_SUITE]]" feature="[[MultiDeviceFeature.BETTER_TOGETHER_SUITE]]"
page-content-data="[[pageContentData]]" page-content-data="[[pageContentData]]"
deep-link-focus-id$="[[Setting.kMultiDeviceOnOff]]"> deep-link-focus-id$="[[Setting.kMultiDeviceOnOff]]">
...@@ -102,6 +103,7 @@ ...@@ -102,6 +103,7 @@
restamp> restamp>
<settings-multidevice-feature-toggle <settings-multidevice-feature-toggle
class="margin-matches-padding" class="margin-matches-padding"
toggle-aria-label="$i18n{multideviceSuiteToggleA11yLabel}"
feature="[[MultiDeviceFeature.BETTER_TOGETHER_SUITE]]" feature="[[MultiDeviceFeature.BETTER_TOGETHER_SUITE]]"
page-content-data="[[pageContentData]]" page-content-data="[[pageContentData]]"
deep-link-focus-id$="[[Setting.kMultiDeviceOnOff]]"> deep-link-focus-id$="[[Setting.kMultiDeviceOnOff]]">
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
<template is="dom-if" if="[[shouldShowSuiteToggle_(pageContentData)]]" <template is="dom-if" if="[[shouldShowSuiteToggle_(pageContentData)]]"
restamp> restamp>
<settings-multidevice-feature-toggle <settings-multidevice-feature-toggle
toggle-aria-label="$i18n{multideviceSuiteToggleA11yLabel}"
feature="[[MultiDeviceFeature.BETTER_TOGETHER_SUITE]]" feature="[[MultiDeviceFeature.BETTER_TOGETHER_SUITE]]"
page-content-data="[[pageContentData]]" page-content-data="[[pageContentData]]"
deep-link-focus-id$="[[Setting.kMultiDeviceOnOff]]"> deep-link-focus-id$="[[Setting.kMultiDeviceOnOff]]">
......
...@@ -270,6 +270,8 @@ void MultiDeviceSection::AddLoadTimeData( ...@@ -270,6 +270,8 @@ void MultiDeviceSection::AddLoadTimeData(
IDS_SETTINGS_MULTIDEVICE_SETUP_ITEM_HEADING}, IDS_SETTINGS_MULTIDEVICE_SETUP_ITEM_HEADING},
{"multideviceEnabled", IDS_SETTINGS_MULTIDEVICE_ENABLED}, {"multideviceEnabled", IDS_SETTINGS_MULTIDEVICE_ENABLED},
{"multideviceDisabled", IDS_SETTINGS_MULTIDEVICE_DISABLED}, {"multideviceDisabled", IDS_SETTINGS_MULTIDEVICE_DISABLED},
{"multideviceSuiteToggleA11yLabel",
IDS_SETTINGS_MULTIDEVICE_SUITE_TOGGLE_A11Y_LABEL},
{"multideviceSmartLockItemTitle", IDS_SETTINGS_EASY_UNLOCK_SECTION_TITLE}, {"multideviceSmartLockItemTitle", IDS_SETTINGS_EASY_UNLOCK_SECTION_TITLE},
{"multidevicePhoneHubItemTitle", {"multidevicePhoneHubItemTitle",
IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SECTION_TITLE}, IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SECTION_TITLE},
......
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