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

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Rebased. Created 4 years 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 a14921babbe099619444a861d6b1a5a0dc85ffbc..7d195bfa28cee9ca8416de131002da867123eff5 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_state_behavior.html">
<link rel="import" href="/people_page/password_prompt_dialog.html">
<link rel="import" href="/people_page/setup_pin_dialog.html">
@@ -40,6 +41,19 @@
</paper-radio-group>
</div>
+ <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
+ <div class="settings-box single-column">
+ <settings-checkbox
+ pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
jdufault 2016/12/06 17:35:07 4 space indent?
sammiequon 2016/12/06 17:50:04 Thanks. Thought the editor would handle it. Done.
+ label="$i18n{lockScreenFingerprintEnable}">
+ </settings-checkbox>
+ <iron-collapse
+ opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
+ <settings-fingerprint-list></settings-fingerprint-list>
jdufault 2016/12/06 17:35:07 Indentation looks a bit wonky here.
sammiequon 2016/12/06 17:50:04 Done.
+ </iron-collapse>
+ </div>
+ </template>
+
<div class="settings-box single-column">
<settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
label="$i18n{enableScreenlock}">

Powered by Google App Engine
This is Rietveld 408576698