Commit 8af89d1f authored by Abigail Klein's avatar Abigail Klein Committed by Commit Bot

[Live Caption] Fix regression that did not show captions settings

subpage.

The captions settings subpage must be outside of the main content div.
This fixes a regression in which the caption settings subpage was not
linked to the a11y settings subpage. It also fixes a regression
discovered: "Regression: The spinner keep on spinning in
'chrome://settings' page."

Bug: 1069422, 1055150
Change-Id: Id40f612c09e97983be7b30dd26bbc0c09201a9bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144315Reviewed-by: default avatarKatie Dektar <katie@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Auto-Submit: Abigail Klein <abigailbklein@google.com>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757995}
parent 288f9695
...@@ -48,15 +48,6 @@ ...@@ -48,15 +48,6 @@
label="$i18n{accessibleImageLabelsTitle}" label="$i18n{accessibleImageLabelsTitle}"
sub-label="$i18n{accessibleImageLabelsSubtitle}"> sub-label="$i18n{accessibleImageLabelsSubtitle}">
</settings-toggle-button> </settings-toggle-button>
</if>
<if expr="not is_macosx and not chromeos">
<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>
</if> </if>
<template is="dom-if" if="[[enableLiveCaption_]]"> <template is="dom-if" if="[[enableLiveCaption_]]">
<settings-toggle-button <settings-toggle-button
...@@ -70,6 +61,15 @@ ...@@ -70,6 +61,15 @@
external> external>
</cr-link-row> </cr-link-row>
</div> </div>
<if expr="not is_macosx and not chromeos">
<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>
</if>
</settings-animated-pages> </settings-animated-pages>
</template> </template>
<script src="a11y_page.js"></script> <script src="a11y_page.js"></script>
......
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