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

[OOBE] Migrate Encryption Migration screen to use hidden attribute

Change-Id: I5c8ce837ae685c86dc6383790dc6cf1e384def1d
Bug: 1058022
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2110850Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753181}
parent 6d5a08a0
...@@ -13,30 +13,26 @@ ...@@ -13,30 +13,26 @@
<link rel="stylesheet" href="oobe_dialog_host.css"> <link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="encryption_migration.css"> <link rel="stylesheet" href="encryption_migration.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<template is="dom-if" if="[[isInitial_(uiState)]]"> <oobe-dialog tabindex="0" has-buttons hidden="[[!isInitial_(uiState)]]">
<oobe-dialog tabindex="0" has-buttons></oobe-dialog> </oobe-dialog>
</template> <oobe-dialog id="minimal-migration-dialog" tabindex="0" has-buttons
<template is="dom-if" if="[[isMigratingMinimal_(uiState)]]"> hidden="[[!isMigratingMinimal_(uiState)]]">
<oobe-dialog id="minimal-migration-dialog" tabindex="0" has-buttons>
<div slot="footer" class="layout vertical"> <div slot="footer" class="layout vertical">
<throbber-notice text-key="gaiaLoading"></throbber-notice> <throbber-notice text-key="gaiaLoading"></throbber-notice>
</div> </div>
</oobe-dialog> </oobe-dialog>
</template>
<template is="dom-if" if="[[isReady_(uiState)]]">
<oobe-dialog tabindex="0" id="ready-dialog" has-buttons <oobe-dialog tabindex="0" id="ready-dialog" has-buttons
title-key="migrationReadyTitle" title-key="migrationReadyTitle" hidden="[[!isReady_(uiState)]]"
subtitle-key="migrationReadyDescription"> subtitle-key="migrationReadyDescription">
<iron-icon slot="oobe-icon" class="warning-icon"></iron-icon> <iron-icon slot="oobe-icon" class="warning-icon"></iron-icon>
<template is="dom-if" if="[[isEnoughBattery]]"> <div slot="footer" class="layout vertical center center-justified"
<div slot="footer" class="layout vertical center center-justified"> hidden="[[!isEnoughBattery]]">
<img srcset="images/security_update_1x.png 1x, <img srcset="images/security_update_1x.png 1x,
images/security_update_2x.png 2x" images/security_update_2x.png 2x"
class="oobe-illustration"> class="oobe-illustration">
</div> </div>
</template> <div slot="footer" class="layout vertical" aria-live="polite"
<template is="dom-if" if="[[!isEnoughBattery]]"> hidden="[[isEnoughBattery]]">
<div slot="footer" class="layout vertical" aria-live="polite">
<div class="warning"> <div class="warning">
[[computeBatteryWarningLabel_(locale, batteryPercent)]] [[computeBatteryWarningLabel_(locale, batteryPercent)]]
</div> </div>
...@@ -51,10 +47,8 @@ ...@@ -51,10 +47,8 @@
necessaryBatteryPercent)]] necessaryBatteryPercent)]]
</div> </div>
</div> </div>
</template> <div slot="bottom-buttons" class="flex layout horizontal"
</div> hidden="[[isResuming]]">
<template is="dom-if" if="[[!isResuming]]">
<div slot="bottom-buttons" class="flex layout horizontal">
<div class="flex"></div> <div class="flex"></div>
<oobe-text-button border id="skip-button" on-tap="onSkip_" <oobe-text-button border id="skip-button" on-tap="onSkip_"
hidden="[[isSkipHidden_()]]" text-key="migrationButtonSkip"> hidden="[[isSkipHidden_()]]" text-key="migrationButtonSkip">
...@@ -63,11 +57,9 @@ ...@@ -63,11 +57,9 @@
disabled="[[isUpdateDisabled_(isEnoughBattery, isSkipped)]]" disabled="[[isUpdateDisabled_(isEnoughBattery, isSkipped)]]"
text-key="migrationButtonUpdate"></oobe-text-button> text-key="migrationButtonUpdate"></oobe-text-button>
</div> </div>
</template>
</oobe-dialog> </oobe-dialog>
</template>
<template is="dom-if" if="[[isMigrating_(uiState)]]">
<oobe-dialog id="migrating-dialog" tabindex="0" <oobe-dialog id="migrating-dialog" tabindex="0"
hidden="[[!isMigrating_(uiState)]]"
title-key="migrationMigratingTitle" title-key="migrationMigratingTitle"
subtitle-key="migrationMigratingDescription"> subtitle-key="migrationMigratingDescription">
<iron-icon slot="oobe-icon" class="chrome-logo"></iron-icon> <iron-icon slot="oobe-icon" class="chrome-logo"></iron-icon>
...@@ -83,9 +75,8 @@ ...@@ -83,9 +75,8 @@
</template> </template>
</div> </div>
</oobe-dialog> </oobe-dialog>
</template>
<template is="dom-if" if="[[isMigrationFailed_(uiState)]]">
<oobe-dialog id="error-dialog" tabindex="0" has-buttons <oobe-dialog id="error-dialog" tabindex="0" has-buttons
hidden="[[!isMigrationFailed_(uiState)]]"
title-key="migrationFailedTitle" title-key="migrationFailedTitle"
subtitle-key="migrationFailedSubtitle"> subtitle-key="migrationFailedSubtitle">
<iron-icon icon="cr:warning" slot="oobe-icon" class="warning"> <iron-icon icon="cr:warning" slot="oobe-icon" class="warning">
...@@ -104,9 +95,8 @@ ...@@ -104,9 +95,8 @@
</oobe-text-button> </oobe-text-button>
</div> </div>
</oobe-dialog> </oobe-dialog>
</template>
<template is="dom-if" if="[[isNotEnoughSpace_(uiState)]]">
<oobe-dialog id="insufficient-space-dialog" tabindex="0" has-buttons <oobe-dialog id="insufficient-space-dialog" tabindex="0" has-buttons
hidden="[[!isNotEnoughSpace_(uiState)]]"
title-key="migrationReadyTitle" title-key="migrationReadyTitle"
subtitle-key="migrationReadyDescription"> subtitle-key="migrationReadyDescription">
<iron-icon slot="oobe-icon" class="chrome-logo"></iron-icon> <iron-icon slot="oobe-icon" class="chrome-logo"></iron-icon>
...@@ -124,18 +114,16 @@ ...@@ -124,18 +114,16 @@
</div> </div>
<div slot="bottom-buttons" class="flex layout horizontal"> <div slot="bottom-buttons" class="flex layout horizontal">
<div class="flex"></div> <div class="flex"></div>
<template is="dom-if" if="[[!isResuming]]">
<oobe-text-button inverse id="insufficient-space-skip-button" <oobe-text-button inverse id="insufficient-space-skip-button"
hidden="[[isResuming]]"
on-tap="onSkip_" text-key="migrationButtonContinue"> on-tap="onSkip_" text-key="migrationButtonContinue">
</oobe-text-button> </oobe-text-button>
</template>
<template is="dom-if" if="[[isResuming]]">
<oobe-text-button inverse id="insufficient-space-restart-button" <oobe-text-button inverse id="insufficient-space-restart-button"
hidden="[[!isResuming]]"
on-tap="onRestartOnLowStorage_" on-tap="onRestartOnLowStorage_"
text-key="migrationButtonRestart"></oobe-text-button> text-key="migrationButtonRestart">
</template> </oobe-text-button>
</div> </div>
</oobe-dialog> </oobe-dialog>
</template> </template>
</template>
</dom-module> </dom-module>
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