diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/people_page/lock_screen.html')
| -rw-r--r-- | chromium/chrome/browser/resources/settings/people_page/lock_screen.html | 75 |
1 files changed, 47 insertions, 28 deletions
diff --git a/chromium/chrome/browser/resources/settings/people_page/lock_screen.html b/chromium/chrome/browser/resources/settings/people_page/lock_screen.html index 49195e5e113..ef82ae02f76 100644 --- a/chromium/chrome/browser/resources/settings/people_page/lock_screen.html +++ b/chromium/chrome/browser/resources/settings/people_page/lock_screen.html @@ -13,7 +13,7 @@ <link rel="import" href="fingerprint_browser_proxy.html"> <link rel="import" href="lock_screen_constants.html"> <link rel="import" href="lock_state_behavior.html"> -<link rel="import" href="password_prompt_dialog.html"> +<link rel="import" href="lock_screen_password_prompt_dialog.html"> <link rel="import" href="setup_pin_dialog.html"> <link rel="import" href="../i18n_setup.html"> <link rel="import" href="../prefs/prefs_behavior.html"> @@ -26,7 +26,7 @@ <template> <style include="settings-shared"> cr-policy-indicator { - -webkit-margin-start: auto; + margin-inline-start: auto; /* Align the indicator with the h2 that it is associated with. */ padding-bottom: 12px; padding-top: 24px; @@ -126,32 +126,50 @@ </div> </template> + <template is="dom-if" if="[[lockScreenNotificationsEnabled_]]"> + <h2 class="settings-box"> + $i18n{lockScreenNotificationTitle} + </h2> + <div class="list-frame"> + <settings-radio-group + pref="{{prefs.ash.message_center.lock_screen_mode}}" + selectable="cr-radio-button"> + <template is="dom-if" + if="[[lockScreenHideSensitiveNotificationSupported_]]"> + <cr-radio-button name="hideSensitive" class="list-item underbar" + pref="[[prefs.ash.message_center.lock_screen_mode]]" + label="$i18n{lockScreenNotificationHideSensitive}"> + </cr-radio-button> + </template> + <cr-radio-button name="show" class="list-item underbar" + pref="[[prefs.ash.message_center.lock_screen_mode]]" + label="$i18n{lockScreenNotificationShow}"> + </cr-radio-button> + <cr-radio-button name="hide" class="list-item" + pref="[[prefs.ash.message_center.lock_screen_mode]]" + label="$i18n{lockScreenNotificationHide}"> + </cr-radio-button> + </settings-radio-group> + </div> + </template> + <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> - <div id="fingerprintDiv"> - <settings-toggle-button class="continuation" - pref="{{prefs.settings.enable_quick_unlock_fingerprint}}" - label="$i18n{lockScreenFingerprintEnable}"> - </settings-toggle-button> - <iron-collapse - opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]"> - <div class="settings-box continuation"> - <div class="start"> - $i18n{lockScreenEditFingerprints} - <div class="secondary" id="lockScreenEditFingerprintsSecondary"> - [[getDescriptionText_(numFingerprints_)]] - </div> - </div> - <div class="separator"></div> - <div class="secondary-action"> - <paper-button class="secondary-button" - on-click="onEditFingerprints_" - aria-label="$i18n{lockScreenEditFingerprints}" - aria-descibedby="lockScreenEditFingerprintsSecondary"> - $i18n{lockScreenSetupFingerprintButton} - </paper-button> - </div> + <div id="fingerprintDiv" class="settings-box two-line"> + <div class="start"> + $i18n{lockScreenEditFingerprints} + <div class="secondary" id="lockScreenEditFingerprintsSecondary"> + [[getDescriptionText_(numFingerprints_)]] </div> - </iron-collapse> + </div> + <div class="separator"></div> + <div class="secondary-action"> + <paper-button class="secondary-button" + on-click="onEditFingerprints_" + aria-label="$i18n{lockScreenEditFingerprints}" + aria-descibedby="lockScreenEditFingerprintsSecondary"> + $i18n{lockScreenSetupFingerprintButton} + </paper-button> + </div> </div> </template> @@ -202,10 +220,11 @@ </template> <template is="dom-if" if="[[showPasswordPromptDialog_]]" restamp> - <settings-password-prompt-dialog id="passwordPrompt" + <settings-lock-screen-password-prompt-dialog + id="lockScreenPasswordPrompt" on-close="onPasswordPromptDialogClose_" set-modes="{{setModes_}}" auth-token="{{authToken_}}"> - </settings-password-prompt-dialog> + </settings-lock-screen-password-prompt-dialog> </template> <template is="dom-if" if="[[showSetupPinDialog_]]" restamp> |