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

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 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 cf290e9fb9302b6f7d1dfcd3a2450b7c84463eb1..829c40659f2a5a85ca30361e7636386951448779 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.html
+++ b/chrome/browser/resources/settings/people_page/lock_screen.html
@@ -3,6 +3,7 @@
<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="/controls/settings_toggle_button.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">
@@ -25,24 +26,38 @@
</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)]]">
- <!-- TODO(dbeam): I seriously doubt paper-button[is=action-link] is
- a good idea. -->
- <paper-button is="action-link" on-tap="onConfigurePin_">
- [[getSetupPinText_(hasPin)]]
- </paper-button>
+ <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">
+ <settings-toggle-button class="start"
+ pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
+ label="$i18n{lockScreenFingerprintEnable}">
+ </settings-toggle-button>
+ </div>
+ <iron-collapse
+ opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
+ <div class="settings-box continuation">
+ <settings-fingerprint-list></settings-fingerprint-list>
</div>
- </paper-radio-group>
- </div>
+ </iron-collapse>
+ </template>
<div class="settings-box">
<settings-toggle-button class="start"

Powered by Google App Engine
This is Rietveld 408576698