Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1273)

Unified Diff: chrome/browser/resources/settings/people_page/lock_screen.html

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Modified the flags. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/people_page/lock_screen.html
diff --git a/chrome/browser/resources/settings/people_page/lock_screen.html b/chrome/browser/resources/settings/people_page/lock_screen.html
index be7d39f3fee26d06c5b9adc8608c3e8df892022d..a8c5de1f7942d02fc07eb4ec98fd8c159a04dcea 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.html
+++ b/chrome/browser/resources/settings/people_page/lock_screen.html
@@ -2,6 +2,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper-radio-group.html">
+<link rel="import" href="/people_page/fingerprint_list.html">
<link rel="import" href="/people_page/lock_screen_constants.html">
<link rel="import" href="/people_page/lock_state_behavior.html">
<link rel="import" href="/people_page/password_prompt_dialog.html">
@@ -24,24 +25,39 @@
</style>
<div>
- <div class="list-frame">
- <paper-radio-group selected="{{selectedUnlockType}}">
- <paper-radio-button name="password">
- $i18n{lockScreenPasswordOnly}
- </paper-radio-button>
- <paper-radio-button name="pin+password">
- $i18n{lockScreenPinOrPassword}
- </paper-radio-button>
- <div class="settings-box continuation radio-indent"
- hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
- <paper-button is="action-link" on-tap="onConfigurePin_">
- [[getSetupPinText_(hasPin)]]
- </paper-button>
- </div>
- </paper-radio-group>
- </div>
+ <template is="dom-if" if="[[pinUnlockEnabled_]]">
+ <div class="list-frame">
+ <paper-radio-group selected="{{selectedUnlockType}}">
+ <paper-radio-button name="password">
+ $i18n{lockScreenPasswordOnly}
+ </paper-radio-button>
+ <paper-radio-button name="pin+password">
+ $i18n{lockScreenPinOrPassword}
+ </paper-radio-button>
+ <div class="settings-box continuation radio-indent"
+ hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
+ <paper-button is="action-link" on-tap="onConfigurePin_">
+ [[getSetupPinText_(hasPin)]]
+ </paper-button>
+ </div>
+ </paper-radio-group>
+ </div>
+ </template>
+
+ <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
+ <div class="settings-box single-column">
+ <settings-checkbox
+ pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
+ label="$i18n{lockScreenFingerprintEnable}">
+ </settings-checkbox>
+ <iron-collapse
+ opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
+ <settings-fingerprint-list></settings-fingerprint-list>
+ </iron-collapse>
+ </div>
+ </template>
- <div class="settings-box single-column">
+ <div class="settings-box single-column screen-lock">
Dan Beam 2017/01/10 23:23:46 what does the .screen-lock class does?
sammiequon 2017/01/11 00:29:09 This is for c/b/r/o/c/quick_unlock_configure_overl
<settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
label="$i18n{enableScreenlock}">
</settings-checkbox>

Powered by Google App Engine
This is Rietveld 408576698