Commit 4a27652c authored by Yue Li's avatar Yue Li Committed by Commit Bot

Add ChromeVox support for Assistant optin flow

Bug: 930994
Test: Manual Test
Change-Id: I18da4e8c5767002c709f72293c76c8e67259d1d9
Reviewed-on: https://chromium-review.googlesource.com/c/1484231Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635209}
parent 6fe9b1d9
...@@ -8,10 +8,12 @@ ...@@ -8,10 +8,12 @@
<link rel="stylesheet" href="assistant_get_more.css"> <link rel="stylesheet" href="assistant_get_more.css">
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
<oobe-dialog id="get-more-dialog" role="dialog" has-buttons hide-shadow <oobe-dialog id="get-more-dialog" role="dialog" has-buttons hide-shadow
no-footer-padding no-header> no-footer-padding no-header
i18n-values="aria-label:assistantReadyTitle">
<div slot="footer"> <div slot="footer">
<div class="container"> <div class="container">
<img id="logo" src="assistant_logo.png"> <img id="logo" src="assistant_logo.png"
i18n-values="aria-label:assistantLogo">
<div class="title" i18n-content="assistantReadyTitle"></div> <div class="title" i18n-content="assistantReadyTitle"></div>
<div class="content" id="intro-text" <div class="content" id="intro-text"
i18n-content="assistantReadyMessage"></div> i18n-content="assistantReadyMessage"></div>
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
no-footer-padding no-header> no-footer-padding no-header>
<div slot="footer"> <div slot="footer">
<div class="container" id="error-container"> <div class="container" id="error-container">
<img id="logo" src="assistant_logo.png"> <img id="logo" src="assistant_logo.png"
i18n-values="aria-label:assistantLogo">
<div class="title" i18n-content="assistantOptinLoadErrorTitle"></div> <div class="title" i18n-content="assistantOptinLoadErrorTitle"></div>
<div class="sub-title" i18n-content="assistantOptinLoadErrorMessage"> <div class="sub-title" i18n-content="assistantOptinLoadErrorMessage">
</div> </div>
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
no-footer-padding no-header> no-footer-padding no-header>
<div slot="footer"> <div slot="footer">
<div class="container"> <div class="container">
<img id="logo" src="assistant_logo.png"> <img id="logo" src="assistant_logo.png"
i18n-values="aria-label:assistantLogo">
<div class="title" id="title-text"></div> <div class="title" id="title-text"></div>
<div class="line"></div> <div class="line"></div>
<div id="insertion-point"></div> <div id="insertion-point"></div>
......
...@@ -111,6 +111,8 @@ Polymer({ ...@@ -111,6 +111,8 @@ Polymer({
* Reload the page with the given consent string text data. * Reload the page with the given consent string text data.
*/ */
reloadContent: function(data) { reloadContent: function(data) {
this.$['third-party-dialog'].setAttribute(
'aria-label', data['thirdPartyTitle']);
this.$['title-text'].textContent = data['thirdPartyTitle']; this.$['title-text'].textContent = data['thirdPartyTitle'];
this.$['next-button-text'].textContent = data['thirdPartyContinueButton']; this.$['next-button-text'].textContent = data['thirdPartyContinueButton'];
this.$['footer-text'].innerHTML = this.$['footer-text'].innerHTML =
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
role="dialog" has-buttons no-footer-padding no-header> role="dialog" has-buttons no-footer-padding no-header>
<div slot="footer"> <div slot="footer">
<div class="container"> <div class="container">
<img id="logo" src="assistant_logo.png"> <img id="logo" src="assistant_logo.png"
i18n-values="aria-label:assistantLogo">
<div class="title" id="title-text"></div> <div class="title" id="title-text"></div>
<div class="content" id="intro-text"></div> <div class="content" id="intro-text"></div>
<div class="flex layout horizontal center"> <div class="flex layout horizontal center">
......
...@@ -241,6 +241,8 @@ Polymer({ ...@@ -241,6 +241,8 @@ Polymer({
* Reload the page with the given consent string text data. * Reload the page with the given consent string text data.
*/ */
reloadContent: function(data) { reloadContent: function(data) {
this.$['value-prop-dialog'].setAttribute(
'aria-label', data['valuePropTitle']);
this.$['user-image'].src = data['valuePropUserImage']; this.$['user-image'].src = data['valuePropUserImage'];
this.$['title-text'].textContent = data['valuePropTitle']; this.$['title-text'].textContent = data['valuePropTitle'];
this.$['intro-text'].textContent = data['valuePropIntro']; this.$['intro-text'].textContent = data['valuePropIntro'];
......
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
<link rel="stylesheet" href="assistant_voice_match.css"> <link rel="stylesheet" href="assistant_voice_match.css">
<oobe-dialog id="voice-match-dialog" role="dialog" has-buttons hide-shadow <oobe-dialog id="voice-match-dialog" role="dialog" has-buttons hide-shadow
no-footer-padding no-header class="intro"> no-footer-padding no-header class="intro"
i18n-values="aria-label:assistantVoiceMatchTitle">
<div slot="footer"> <div slot="footer">
<div class="container"> <div class="container">
<img id="logo" src="assistant_logo.png"> <img id="logo" src="assistant_logo.png"
i18n-values="aria-label:assistantLogo">
<div id="intro-container"> <div id="intro-container">
<div class="title" i18n-content="assistantVoiceMatchTitle"></div> <div class="title" i18n-content="assistantVoiceMatchTitle"></div>
<div class="content" <div class="content"
......
...@@ -59,6 +59,7 @@ AssistantOptInFlowScreenHandler::~AssistantOptInFlowScreenHandler() { ...@@ -59,6 +59,7 @@ AssistantOptInFlowScreenHandler::~AssistantOptInFlowScreenHandler() {
void AssistantOptInFlowScreenHandler::DeclareLocalizedValues( void AssistantOptInFlowScreenHandler::DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) { ::login::LocalizedValuesBuilder* builder) {
builder->Add("locale", g_browser_process->GetApplicationLocale()); builder->Add("locale", g_browser_process->GetApplicationLocale());
builder->Add("assistantLogo", IDS_VOICE_INTERACTION_LOGO);
builder->Add("assistantOptinLoading", builder->Add("assistantOptinLoading",
IDS_VOICE_INTERACTION_VALUE_PROP_LOADING); IDS_VOICE_INTERACTION_VALUE_PROP_LOADING);
builder->Add("assistantOptinLoadErrorTitle", builder->Add("assistantOptinLoadErrorTitle",
......
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