Commit b8f7d80a authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

OOBE: Do not start animation on marketing opt-in screen until it is shown

BUG=b:169122360

Change-Id: I7aac27aaaa769dec9a046c40e822d6f96b94d76b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445500
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Renato Silva <rrsilva@google.com>
Auto-Submit: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarRenato Silva <rrsilva@google.com>
Cr-Commit-Position: refs/heads/master@{#813276}
parent b119a833
...@@ -41,24 +41,31 @@ Polymer({ ...@@ -41,24 +41,31 @@ Polymer({
behaviors: [OobeI18nBehavior, OobeDialogHostBehavior, LoginScreenBehavior], behaviors: [OobeI18nBehavior, OobeDialogHostBehavior, LoginScreenBehavior],
/** Overridden from LoginScreenBehavior. */ /** Overridden from LoginScreenBehavior. */
// clang-format off
EXTERNAL_API: [ EXTERNAL_API: [
'updateA11ySettingsButtonVisibility', 'updateA11ySettingsButtonVisibility',
'updateA11yNavigationButtonToggle', 'updateA11yNavigationButtonToggle',
'setOptInVisibility', 'setOptInVisibility',
'setEmailToggleState' 'setEmailToggleState'
], ],
// clang-format on
/** @override */ /** @override */
ready() { ready() {
this.initializeLoginScreen('MarketingOptInScreen', {resetAllowed: true}); this.initializeLoginScreen('MarketingOptInScreen', {resetAllowed: true});
},
/** Shortcut method to control animation */
setAnimationPlay_(played) {
this.$['marketingOptInOverviewDialog'] this.$['marketingOptInOverviewDialog']
.querySelector('.marketing-animation') .querySelector('.marketing-animation')
.setPlay(true); .setPlay(played);
}, },
/** Called when dialog is shown */ /** Called when dialog is shown */
onBeforeShow() { onBeforeShow() {
this.isAccessibilitySettingsShown_ = false; this.isAccessibilitySettingsShown_ = false;
this.setAnimationPlay_(true);
this.$.marketingOptInOverviewDialog.show(); this.$.marketingOptInOverviewDialog.show();
}, },
...@@ -67,9 +74,7 @@ Polymer({ ...@@ -67,9 +74,7 @@ Polymer({
* @private * @private
*/ */
onGetStarted_() { onGetStarted_() {
this.$['marketingOptInOverviewDialog'] this.setAnimationPlay_(false);
.querySelector('.marketing-animation')
.setPlay(false);
chrome.send( chrome.send(
'login.MarketingOptInScreen.onGetStarted', 'login.MarketingOptInScreen.onGetStarted',
[this.$.chromebookUpdatesOption.checked]); [this.$.chromebookUpdatesOption.checked]);
...@@ -112,9 +117,7 @@ Polymer({ ...@@ -112,9 +117,7 @@ Polymer({
*/ */
onToggleAccessibilityPage_() { onToggleAccessibilityPage_() {
this.isAccessibilitySettingsShown_ = !this.isAccessibilitySettingsShown_; this.isAccessibilitySettingsShown_ = !this.isAccessibilitySettingsShown_;
this.$['marketingOptInOverviewDialog'] this.setAnimationPlay_(!this.isAccessibilitySettingsShown_);
.querySelector('.marketing-animation')
.setPlay(!this.isAccessibilitySettingsShown_);
}, },
/** /**
......
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