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

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: 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 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_screen_constants.html"> 6 <link rel="import" href="/people_page/lock_screen_constants.html">
6 <link rel="import" href="/people_page/lock_state_behavior.html"> 7 <link rel="import" href="/people_page/lock_state_behavior.html">
7 <link rel="import" href="/people_page/password_prompt_dialog.html"> 8 <link rel="import" href="/people_page/password_prompt_dialog.html">
8 <link rel="import" href="/people_page/setup_pin_dialog.html"> 9 <link rel="import" href="/people_page/setup_pin_dialog.html">
9 <link rel="import" href="/prefs/prefs_behavior.html"> 10 <link rel="import" href="/prefs/prefs_behavior.html">
10 <link rel="import" href="/route.html"> 11 <link rel="import" href="/route.html">
11 <link rel="import" href="/settings_shared_css.html"> 12 <link rel="import" href="/settings_shared_css.html">
12 13
13 <dom-module id="settings-lock-screen"> 14 <dom-module id="settings-lock-screen">
14 <template> 15 <template>
15 <style include="settings-shared"></style> 16 <style include="settings-shared"></style>
16 <style> 17 <style>
17 .radio-indent { 18 .radio-indent {
18 margin-left: 28px; 19 margin-left: 28px;
19 } 20 }
20 21
21 paper-button { 22 paper-button {
22 text-transform: none; 23 text-transform: none;
23 } 24 }
24 </style> 25 </style>
25 26
26 <div> 27 <div>
27 <div class="list-frame"> 28 <template is="dom-if" if="[[pinUnlockEnabled_]]">
28 <paper-radio-group selected="{{selectedUnlockType}}"> 29 <div class="list-frame">
29 <paper-radio-button name="password"> 30 <paper-radio-group selected="{{selectedUnlockType}}">
30 $i18n{lockScreenPasswordOnly} 31 <paper-radio-button name="password">
31 </paper-radio-button> 32 $i18n{lockScreenPasswordOnly}
32 <paper-radio-button name="pin+password"> 33 </paper-radio-button>
33 $i18n{lockScreenPinOrPassword} 34 <paper-radio-button name="pin+password">
34 </paper-radio-button> 35 $i18n{lockScreenPinOrPassword}
35 <div class="settings-box continuation radio-indent" 36 </paper-radio-button>
36 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> 37 <div class="settings-box continuation radio-indent"
37 <paper-button is="action-link" on-tap="onConfigurePin_"> 38 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
38 [[getSetupPinText_(hasPin)]] 39 <paper-button is="action-link" on-tap="onConfigurePin_">
39 </paper-button> 40 [[getSetupPinText_(hasPin)]]
40 </div> 41 </paper-button>
41 </paper-radio-group> 42 </div>
42 </div> 43 </paper-radio-group>
44 </div>
45 </template>
43 46
44 <div class="settings-box single-column"> 47 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
48 <div class="settings-box single-column">
49 <settings-checkbox
50 pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
51 label="$i18n{lockScreenFingerprintEnable}">
52 </settings-checkbox>
53 <iron-collapse
54 opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
55 <settings-fingerprint-list></settings-fingerprint-list>
56 </iron-collapse>
57 </div>
58 </template>
59
60 <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
45 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 61 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
46 label="$i18n{enableScreenlock}"> 62 label="$i18n{enableScreenlock}">
47 </settings-checkbox> 63 </settings-checkbox>
48 </div> 64 </div>
49 65
50 <settings-password-prompt-dialog id="passwordPrompt" 66 <settings-password-prompt-dialog id="passwordPrompt"
51 on-close="onPasswordClosed_" 67 on-close="onPasswordClosed_"
52 set-modes="{{setModes_}}"> 68 set-modes="{{setModes_}}">
53 </settings-password-prompt-dialog> 69 </settings-password-prompt-dialog>
54 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 70 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
55 set-modes="[[setModes_]]"> 71 set-modes="[[setModes_]]">
56 </settings-setup-pin-dialog> 72 </settings-setup-pin-dialog>
57 </div> 73 </div>
58 </template> 74 </template>
59 75
60 <script src="lock_screen.js"></script> 76 <script src="lock_screen.js"></script>
61 </dom-module> 77 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698