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

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

Powered by Google App Engine
This is Rietveld 408576698