Skip to content

GitLab

T
tangled
Commit a360169c authored by evliu's avatar evliu Committed by Commit Bot
Browse files
Options

Refactor the A11Y page to fix a regression that hid the "more features" link 

when the SplitSettings flag is enabled.

Bug: 980783
Change-Id: I6d5ad8223f539e89a7e9b5002fa7574506671c3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1704745
Commit-Queue: Evan Liu <evliu@google.com>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678345}
parent 9b180958
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 87 deletions
chrome/browser/resources/settings/a11y_page/a11y_page.html
View file @ a360169c
...@@ -19,101 +19,96 @@ ...@@ -19,101 +19,96 @@
<dom-module id="settings-a11y-page"> <dom-module id="settings-a11y-page">
<template> <template>
<style include="settings-shared"></style> <style include="settings-shared"></style>
<template is="dom-if" if="[[showCaptionSettings_]]">
<cr-link-row class="hr" id="captions" label="$i18n{captionsTitle}"
on-click="onCaptionsClick_">
</cr-link-row>
</template>
<settings-animated-pages id="pages" current-route="{{currentRoute}}" <settings-animated-pages id="pages" current-route="{{currentRoute}}"
section="a11y" focus-config="[[focusConfig_]]"> section="a11y" focus-config="[[focusConfig_]]">
<if expr="not chromeos"> <if expr="not chromeos">
<div route-path="default">
<settings-toggle-button
id="a11yImageLabels"
hidden$="[[!showAccessibilityLabelsSetting_]]"
pref="{{prefs.settings.a11y.enable_accessibility_image_labels}}"
on-change="onToggleAccessibilityImageLabels_"
label="$i18n{accessibleImageLabelsTitle}"
sub-label="$i18n{accessibleImageLabelsSubtitle}">
</settings-toggle-button>
<cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
external>
</cr-link-row>
</div>
</if>
<if expr="chromeos or is_linux or is_win">
<template is="dom-if" if="[[showCaptionSettings_]]">
<template is="dom-if" route-path="/captions">
<settings-subpage
associated-control="[[$$('#captions')]]"
page-title="$i18n{captionsTitle}">
<settings-captions prefs="{{prefs}}"></settings-captions>
</settings-subpage>
</template>
</template>
</if>
<if expr="chromeos">
<template is="dom-if" if="[[pageVisibility.webstoreLink]]">
<div route-path="default"> <div route-path="default">
<template is="dom-if" if="[[showCaptionSettings_]]"> <settings-toggle-button
<cr-link-row class="hr" id="captions" label="$i18n{captionsTitle}" id="a11yImageLabels"
on-click="onTapCaptions_"> hidden$="[[!showAccessibilityLabelsSetting_]]"
</cr-link-row> pref="{{prefs.settings.a11y.enable_accessibility_image_labels}}"
</template> on-change="onToggleAccessibilityImageLabels_"
<if expr="not chromeos"> label="$i18n{accessibleImageLabelsTitle}"
<settings-toggle-button id="a11yImageLabels" sub-label="$i18n{accessibleImageLabelsSubtitle}">
hidden$="[[!showAccessibilityLabelsSetting_]]" </settings-toggle-button>
pref="{{prefs.settings.a11y.enable_accessibility_image_labels}}" <settings-toggle-button id="optionsInMenuToggle"
on-change="onToggleAccessibilityImageLabels_" label="$i18n{optionsInMenuLabel}"
label="$i18n{accessibleImageLabelsTitle}" pref="{{prefs.settings.a11y.enable_menu}}">
sub-label="$i18n{accessibleImageLabelsSubtitle}"> </settings-toggle-button>
</settings-toggle-button> <cr-link-row class="hr" id="subpage-trigger"
<cr-link-row class="hr" label="$i18n{moreFeaturesLink}" label="$i18n{manageAccessibilityFeatures}"
on-click="onMoreFeaturesLinkClick_" on-click="onManageAccessibilityFeaturesTap_"
sub-label="$i18n{a11yWebStore}" external></cr-link-row> sub-label="$i18n{moreFeaturesLinkDescription}">
</if> </cr-link-row>
</div> </div>
</if> <template is="dom-if" route-path="/manageAccessibility">
<if expr="chromeos"> <settings-subpage
<template is="dom-if" if="[[pageVisibility.webstoreLink]]"> associated-control="[[$$('#subpage-trigger')]]"
<div route-path="default"> page-title="$i18n{manageAccessibilityFeatures}">
<template is="dom-if" if="[[showCaptionSettings_]]"> <settings-manage-a11y-page prefs="{{prefs}}">
<cr-link-row class="hr" id="captions" </settings-manage-a11y-page>
label="$i18n{captionsTitle}" </settings-subpage>
on-click="onTapCaptions_">
</cr-link-row>
</template>
<settings-toggle-button id="a11yImageLabels"
hidden$="[[!showAccessibilityLabelsSetting_]]"
pref="{{prefs.settings.a11y.enable_accessibility_image_labels}}"
on-change="onToggleAccessibilityImageLabels_"
label="$i18n{accessibleImageLabelsTitle}"
sub-label="$i18n{accessibleImageLabelsSubtitle}">
</settings-toggle-button>
<settings-toggle-button id="optionsInMenuToggle"
label="$i18n{optionsInMenuLabel}"
pref="{{prefs.settings.a11y.enable_menu}}">
</settings-toggle-button>
<cr-link-row class="hr" id="subpage-trigger"
label="$i18n{manageAccessibilityFeatures}"
on-click="onManageAccessibilityFeaturesTap_"
sub-label="$i18n{moreFeaturesLinkDescription}">
</cr-link-row>
</div>
<template is="dom-if" route-path="/manageAccessibility">
<settings-subpage associated-control="[[$$('#subpage-trigger')]]"
page-title="$i18n{manageAccessibilityFeatures}">
<settings-manage-a11y-page prefs="{{prefs}}">
</settings-manage-a11y-page>
</settings-subpage>
</template>
<template is="dom-if" route-path="/manageAccessibility/tts">
<settings-subpage
associated-control="[[$$('#subpage-trigger')]]"
page-title="$i18n{manageTtsSettings}">
<settings-tts-subpage prefs="{{prefs}}">
</settings-tts-subpage>
</settings-subpage>
</template>
<template is="dom-if" if="[[showExperimentalSwitchAccess_]]">
<template is="dom-if"
route-path="/manageAccessibility/switchAccess">
<settings-subpage associated-control="[[$$('#subpage-trigger')]]"
page-title="$i18n{manageSwitchAccessSettings}">
<settings-switch-access-subpage prefs="{{prefs.settings.a11y}}">
</settings-switch-access-subpage>
</settings-subpage>
</template>
</template>
</template> </template>
<cr-link-row class="hr" <template is="dom-if" route-path="/manageAccessibility/tts">
label="$i18n{moreFeaturesLink}" <settings-subpage
on-click="onMoreFeaturesLinkClick_" associated-control="[[$$('#subpage-trigger')]]"
sub-label="$i18n{a11yWebStore}" page-title="$i18n{manageTtsSettings}">
hidden="[[pageVisibility.webstoreLink]]" external></cr-link-row> <settings-tts-subpage prefs="{{prefs}}">
</if> </settings-tts-subpage>
</settings-subpage>
<if expr="chromeos or is_linux or is_win"> </template>
<template is="dom-if" if="[[showCaptionSettings_]]"> <template is="dom-if" if="[[showExperimentalSwitchAccess_]]">
<template is="dom-if" route-path="/captions"> <template is="dom-if"
<settings-subpage route-path="/manageAccessibility/switchAccess">
associated-control="[[$$('#captions')]]" <settings-subpage associated-control="[[$$('#subpage-trigger')]]"
page-title="$i18n{captionsTitle}"> page-title="$i18n{manageSwitchAccessSettings}">
<settings-captions prefs="{{prefs}}"></settings-captions> <settings-switch-access-subpage prefs="{{prefs.settings.a11y}}">
</settings-switch-access-subpage>
</settings-subpage> </settings-subpage>
</template> </template>
</template> </template>
</if> </template>
</if>
</settings-animated-pages> </settings-animated-pages>
<if expr="chromeos">
<cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
hidden="[[pageVisibility.webstoreLink]]" external>
</cr-link-row>
</if>
</template> </template>
<script src="a11y_page.js"></script> <script src="a11y_page.js"></script>
</dom-module> </dom-module>
chrome/browser/resources/settings/a11y_page/a11y_page.js
View file @ a360169c
...@@ -137,7 +137,7 @@ Polymer({ ...@@ -137,7 +137,7 @@ Polymer({
}, },
/** @private */ /** @private */
onTapCaptions_: function() { onCaptionsClick_: function() {
// Open the system captions dialog for Mac. // Open the system captions dialog for Mac.
// <if expr="is_macosx"> // <if expr="is_macosx">
settings.CaptionsBrowserProxyImpl.getInstance().openSystemCaptionsDialog(); settings.CaptionsBrowserProxyImpl.getInstance().openSystemCaptionsDialog();
......
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