Commit 53c528aa authored by evliu's avatar evliu Committed by Commit Bot

Update a11y_page.html to display Captions in split settings mode.

This CL moves div with the default route-path outside of the template
whose visibility depends on a feature flag.

Bug: 980783
Change-Id: I011839bb20efde9435fe007ba270cc6fea9bdd2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1687567
Commit-Queue: Evan Liu <evliu@google.com>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Auto-Submit: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#676245}
parent 01d73bbd
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
</div> </div>
</if> </if>
<if expr="chromeos"> <if expr="chromeos">
<template is="dom-if" if="[[pageVisibility.webstoreLink]]"> <div route-path="default">
<div route-path="default"> <template is="dom-if" if="[[showCaptionSettings_]]">
<template is="dom-if" if="[[showCaptionSettings_]]"> <cr-link-row class="hr" id="captions"
<cr-link-row class="hr" id="captions" label="$i18n{captionsTitle}"
label="$i18n{captionsTitle}" on-click="onTapCaptions_">
on-click="onTapCaptions_"> </cr-link-row>
</cr-link-row> </template>
</template> <template is="dom-if" if="[[pageVisibility.webstoreLink]]">
<settings-toggle-button id="a11yImageLabels" <settings-toggle-button id="a11yImageLabels"
hidden$="[[!showAccessibilityLabelsSetting_]]" hidden$="[[!showAccessibilityLabelsSetting_]]"
pref="{{prefs.settings.a11y.enable_accessibility_image_labels}}" pref="{{prefs.settings.a11y.enable_accessibility_image_labels}}"
...@@ -67,38 +67,42 @@ ...@@ -67,38 +67,42 @@
on-click="onManageAccessibilityFeaturesTap_" on-click="onManageAccessibilityFeaturesTap_"
sub-label="$i18n{moreFeaturesLinkDescription}"> sub-label="$i18n{moreFeaturesLinkDescription}">
</cr-link-row> </cr-link-row>
</div> <template is="dom-if" route-path="/manageAccessibility">
<template is="dom-if" route-path="/manageAccessibility"> <settings-subpage
<settings-subpage associated-control="[[$$('#subpage-trigger')]]" associated-control="[[$$('#subpage-trigger')]]"
page-title="$i18n{manageAccessibilityFeatures}"> page-title="$i18n{manageAccessibilityFeatures}">
<settings-manage-a11y-page prefs="{{prefs}}"> <settings-manage-a11y-page prefs="{{prefs}}">
</settings-manage-a11y-page> </settings-manage-a11y-page>
</settings-subpage> </settings-subpage>
</template> </template>
<template is="dom-if" route-path="/manageAccessibility/tts"> <template is="dom-if" route-path="/manageAccessibility/tts">
<settings-subpage <settings-subpage
associated-control="[[$$('#subpage-trigger')]]" associated-control="[[$$('#subpage-trigger')]]"
page-title="$i18n{manageTtsSettings}"> page-title="$i18n{manageTtsSettings}">
<settings-tts-subpage prefs="{{prefs}}"> <settings-tts-subpage prefs="{{prefs}}">
</settings-tts-subpage> </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> </settings-subpage>
</template> </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>
</template> <cr-link-row class="hr"
<cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
label="$i18n{moreFeaturesLink}" on-click="onMoreFeaturesLinkClick_"
on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
sub-label="$i18n{a11yWebStore}" hidden="[[pageVisibility.webstoreLink]]" external>
hidden="[[pageVisibility.webstoreLink]]" external></cr-link-row> </cr-link-row>
</div>
</if> </if>
<if expr="chromeos or is_linux or is_win"> <if expr="chromeos or is_linux or is_win">
......
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