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

Side by Side 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
5 <link rel="import" href="/people_page/fingerprint_list.html">
5 <link rel="import" href="/people_page/lock_state_behavior.html"> 6 <link rel="import" href="/people_page/lock_state_behavior.html">
6 <link rel="import" href="/people_page/password_prompt_dialog.html"> 7 <link rel="import" href="/people_page/password_prompt_dialog.html">
7 <link rel="import" href="/people_page/setup_pin_dialog.html"> 8 <link rel="import" href="/people_page/setup_pin_dialog.html">
8 <link rel="import" href="/prefs/prefs_behavior.html"> 9 <link rel="import" href="/prefs/prefs_behavior.html">
9 <link rel="import" href="/route.html"> 10 <link rel="import" href="/route.html">
10 <link rel="import" href="/settings_shared_css.html"> 11 <link rel="import" href="/settings_shared_css.html">
11 12
12 <dom-module id="settings-lock-screen"> 13 <dom-module id="settings-lock-screen">
13 <template> 14 <template>
14 <style include="settings-shared"></style> 15 <style include="settings-shared"></style>
(...skipping 18 matching lines...) Expand all
33 </paper-radio-button> 34 </paper-radio-button>
34 <div class="settings-box continuation radio-indent" 35 <div class="settings-box continuation radio-indent"
35 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> 36 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
36 <paper-button is="action-link" on-tap="onConfigurePin_"> 37 <paper-button is="action-link" on-tap="onConfigurePin_">
37 [[getSetupPinText_(hasPin)]] 38 [[getSetupPinText_(hasPin)]]
38 </paper-button> 39 </paper-button>
39 </div> 40 </div>
40 </paper-radio-group> 41 </paper-radio-group>
41 </div> 42 </div>
42 43
44 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
45 <div class="settings-box single-column">
46 <settings-checkbox
47 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.
48 label="$i18n{lockScreenFingerprintEnable}">
49 </settings-checkbox>
50 <iron-collapse
51 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
52 <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.
53 </iron-collapse>
54 </div>
55 </template>
56
43 <div class="settings-box single-column"> 57 <div class="settings-box single-column">
44 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 58 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
45 label="$i18n{enableScreenlock}"> 59 label="$i18n{enableScreenlock}">
46 </settings-checkbox> 60 </settings-checkbox>
47 </div> 61 </div>
48 62
49 <settings-password-prompt-dialog id="passwordPrompt" 63 <settings-password-prompt-dialog id="passwordPrompt"
50 on-close="onPasswordClosed_" 64 on-close="onPasswordClosed_"
51 set-modes="{{setModes_}}"> 65 set-modes="{{setModes_}}">
52 </settings-password-prompt-dialog> 66 </settings-password-prompt-dialog>
53 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 67 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
54 set-modes="[[setModes_]]"> 68 set-modes="[[setModes_]]">
55 </settings-setup-pin-dialog> 69 </settings-setup-pin-dialog>
56 </div> 70 </div>
57 </template> 71 </template>
58 72
59 <script src="lock_screen.js"></script> 73 <script src="lock_screen.js"></script>
60 </dom-module> 74 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698